Merge branch 'origin'
authorMauro Carvalho Chehab <mchehab@infradead.org>
Tue, 31 Jan 2006 20:49:28 +0000 (18:49 -0200)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Tue, 31 Jan 2006 20:49:28 +0000 (18:49 -0200)

Trivial merge