Merge commit 'e4979ab5cff84ef64c88bba3a1b6b4c5e02f7777'
authorColin Guthrie <cguthrie@mandriva.org>
Mon, 17 Jan 2011 22:19:10 +0000 (22:19 +0000)
committerColin Guthrie <cguthrie@mandriva.org>
Mon, 17 Jan 2011 22:19:10 +0000 (22:19 +0000)

Trivial merge