Merge remote branch 'maemo/master'
authorWillem Liu <willem.liu@gmail.com>
Tue, 14 Sep 2010 05:09:57 +0000 (07:09 +0200)
committerWillem Liu <willem.liu@gmail.com>
Tue, 14 Sep 2010 05:09:57 +0000 (07:09 +0200)

Trivial merge