Merge branch 'master' of https://git.maemo.org/projects/hermes
authorAndrew Flegg <andrew@bleb.org>
Fri, 30 Oct 2009 16:22:53 +0000 (16:22 +0000)
committerAndrew Flegg <andrew@bleb.org>
Fri, 30 Oct 2009 16:22:53 +0000 (16:22 +0000)

Trivial merge