Merge branch 'inspect-linking'
authorJeremy Whiting <jpwhiting@kde.org>
Wed, 5 Sep 2012 22:34:23 +0000 (16:34 -0600)
committerJeremy Whiting <jpwhiting@kde.org>
Wed, 5 Sep 2012 22:34:23 +0000 (16:34 -0600)
Reviewed-by: Philip Withnall

Trivial merge