Merge branch 'master' of ssh://drop.maemo.org/git/quicknewsreader
authorTofe <chris.chapuis+gitorious@gmail.com>
Wed, 22 Feb 2012 18:09:22 +0000 (19:09 +0100)
committerTofe <chris.chapuis+gitorious@gmail.com>
Wed, 22 Feb 2012 18:09:22 +0000 (19:09 +0100)

Trivial merge