Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
authorMikko Siren <mikko.siren@ixonos.com>
Fri, 29 May 2009 10:32:11 +0000 (13:32 +0300)
committerMikko Siren <mikko.siren@ixonos.com>
Fri, 29 May 2009 10:32:11 +0000 (13:32 +0300)

Trivial merge