Merge branch 'master' of https://git.maemo.org/projects/g2-sharing
authorHeikki Kallasjoki <fis@zem.fi>
Wed, 11 Nov 2009 07:26:38 +0000 (09:26 +0200)
committerHeikki Kallasjoki <fis@zem.fi>
Wed, 11 Nov 2009 07:26:38 +0000 (09:26 +0200)

Trivial merge