Merge branch 'common_services'
authorAki Koskinen <maemo@akikoskinen.info>
Sun, 21 Mar 2010 15:19:26 +0000 (17:19 +0200)
committerAki Koskinen <maemo@akikoskinen.info>
Sun, 21 Mar 2010 15:19:26 +0000 (17:19 +0200)

Trivial merge