Merge branch 'master' of git://anongit.kde.org/kde-runtime
authorShaun Reich <shaun.reich@kdemail.net>
Wed, 29 Jun 2011 05:42:15 +0000 (01:42 -0400)
committerShaun Reich <shaun.reich@kdemail.net>
Wed, 29 Jun 2011 05:42:15 +0000 (01:42 -0400)
commit3b333645a9e36eb9179b468367c01e435163fa85
tree712d34b2b255a345e4c251e3a3141050e21950d0
parentad697cd39f296b67b2688ae8d5eb3ff1dbb66c63
parent6026c3a32056bdbae6964e25abf712870edf5aac
Merge branch 'master' of git://anongit.kde.org/kde-runtime