Merge branch 'cleantestoutput'
authorJeremy Whiting <jpwhiting@kde.org>
Thu, 12 Jul 2012 20:22:41 +0000 (14:22 -0600)
committerJeremy Whiting <jpwhiting@kde.org>
Thu, 12 Jul 2012 20:22:41 +0000 (14:22 -0600)
Reviewed-by: Philip Withnal
Closes: bgo 657456 https://bugzilla.gnome.org/show_bug.cgi?id=657456


Trivial merge