Merge remote branch 'tanuk2/fixes'
authorColin Guthrie <cguthrie@mandriva.org>
Sat, 5 Jun 2010 17:21:31 +0000 (18:21 +0100)
committerColin Guthrie <cguthrie@mandriva.org>
Sat, 5 Jun 2010 17:21:31 +0000 (18:21 +0100)

Trivial merge