Merge branch 'master' into dev_local
[qtmeetings] / QtMeetings.conf
2009-05-19 Ossi Jormakkaqtmeetings sources to Maemo garage