Git commit 1a1e2b62cb43b59c1ef5d4511c5cde17462137e5 by Stephane Mankowski.
Committed on 01/09/2011 at 00:10.
Pushed by smankowski into branch 'Feature'.

Merge branch 'master' into Feature


http://commits.kde.org/skrooge/1a1e2b62cb43b59c1ef5d4511c5cde17462137e5