Merge branch 'master' of https://vcs.maemo.org/git/hermes
authorFredrik Wendt <fredrik@wendt.se>
Tue, 8 Jun 2010 22:00:14 +0000 (23:00 +0100)
committerFredrik Wendt <fredrik@wendt.se>
Tue, 8 Jun 2010 22:00:14 +0000 (23:00 +0100)

Trivial merge