Merge commit 'refs/1_0_6_candidate' of https://git.maemo.org/projects/qtmeetings... master
authorRisto Lintinen <lintiri@lintiri-desktop.(none)>
Fri, 28 Aug 2009 07:40:10 +0000 (10:40 +0300)
committerRisto Lintinen <lintiri@lintiri-desktop.(none)>
Fri, 28 Aug 2009 07:40:10 +0000 (10:40 +0300)

Trivial merge