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

Trivial merge