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)
commit8c0e3efbf8fcd500048b1c1b21d21a4ea8c09fd3
treefb62e35903de001816bee596da147b10a01eeba6
parent26c64fb54e3376564a76c4bfbd9f56b110d58c30
parente4979ab5cff84ef64c88bba3a1b6b4c5e02f7777
Merge commit 'e4979ab5cff84ef64c88bba3a1b6b4c5e02f7777'