Merge branch '0.7.4-release'
authorJeremy Whiting <jpwhiting@kde.org>
Tue, 11 Sep 2012 21:25:56 +0000 (15:25 -0600)
committerJeremy Whiting <jpwhiting@kde.org>
Tue, 11 Sep 2012 21:25:56 +0000 (15:25 -0600)

Trivial merge