Merge commit 'flameeyes/master'
commit7e4509f9e5a1add8bd7efaf69cefd35a291b6253
authorColin Guthrie <cguthrie@mandriva.org>
Thu, 16 Jul 2009 16:41:25 +0000 (16 17:41 +0100)
committerColin Guthrie <cguthrie@mandriva.org>
Thu, 16 Jul 2009 16:41:25 +0000 (16 17:41 +0100)
treeddfb9a54a174b36ef7299dfb369f266ceeff9501
parent61fefd67dab01011d97a06b7e3dd51101d5f5749
parent84200b423ebfa7e2dad9b1b65f64eac7bf3d2114
Merge commit 'flameeyes/master'