Merge branch 'master' of https://vcs.maemo.org/git/qzeecontrol
authorRuediger Gad <rgad@fb2.fh-frankfurt.de>
Thu, 12 Apr 2012 20:47:19 +0000 (22:47 +0200)
committerRuediger Gad <rgad@fb2.fh-frankfurt.de>
Thu, 12 Apr 2012 20:47:19 +0000 (22:47 +0200)

Trivial merge