From: Andrew Flegg <andrew@bleb.org>
Date: Wed, 9 Jun 2010 21:38:54 +0000 (+0100)
Subject: Merge branch 'master' of git@83.233.175.44:hermes
X-Git-Tag: 0.8.0~14
X-Git-Url: https://vcs.maemo.org/git/?p=hermes;a=commitdiff_plain;h=1baaea336a8784a1bbbf399f4e711832d1149399

Merge branch 'master' of git@83.233.175.44:hermes
---

1baaea336a8784a1bbbf399f4e711832d1149399