Merge branch 'origin'
Mauro Carvalho Chehab [Mon, 6 Feb 2006 12:43:13 +0000 (10:43 -0200)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge