Merge branch 'master' of https://git.maemo.org/projects/hermes
authorAndrew Flegg <andrew@bleb.org>
Sun, 4 Jul 2010 10:50:07 +0000 (11:50 +0100)
committerAndrew Flegg <andrew@bleb.org>
Sun, 4 Jul 2010 10:50:07 +0000 (11:50 +0100)

Trivial merge