Merge branch 'fixes_stg' of ../git_old into fixes
authorMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 4 Sep 2008 19:24:02 +0000 (16:24 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 4 Sep 2008 19:24:02 +0000 (16:24 -0300)

Trivial merge