Merge branch 'work-fixes'
authorMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 8 Mar 2006 15:34:10 +0000 (12:34 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 8 Mar 2006 15:34:10 +0000 (12:34 -0300)

Trivial merge