commit cbbcc30abdc9bbde18d8ff0f1dc3abb88135376c branch master Merge: 31f6d88 187361e Author: Leo Franchi Date: Sun Oct 31 19:38:51 2010 -0400 Merge branch 'master' of git.kde.org:libechonest