Merge branch 'origin'
authorMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 6 Feb 2006 16:35:35 +0000 (14:35 -0200)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 6 Feb 2006 16:35:35 +0000 (14:35 -0200)

Trivial merge