Merge branch 'master' of https://vcs.maemo.org/git/qwerkisync
authorJamie Thompson <coding@jamie-thompson.co.uk>
Fri, 26 Aug 2011 13:11:29 +0000 (14:11 +0100)
committerJamie Thompson <coding@jamie-thompson.co.uk>
Fri, 26 Aug 2011 13:11:29 +0000 (14:11 +0100)

Trivial merge