Merge branch 'work'
Mauro Carvalho Chehab [Sun, 15 Jan 2006 23:31:10 +0000 (21:31 -0200)]

Trivial merge