Merge branch 'origin'
authorMauro Carvalho Chehab <mchehab@infradead.org>
Tue, 7 Feb 2006 10:11:05 +0000 (08:11 -0200)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Tue, 7 Feb 2006 10:11:05 +0000 (08:11 -0200)

Trivial merge