Merge https://vcs.maemo.org/git/qzeecontrol
authorRuediger Gad <rgad@fb2.fh-frankfurt.de>
Thu, 12 Apr 2012 18:30:10 +0000 (20:30 +0200)
committerRuediger Gad <rgad@fb2.fh-frankfurt.de>
Thu, 12 Apr 2012 18:30:10 +0000 (20:30 +0200)

Trivial merge