From: Andrew Flegg <andrew@bleb.org>
Date: Wed, 9 Jun 2010 22:53:04 +0000 (+0100)
Subject: Merge branch 'master' of git@83.233.175.44:hermes
X-Git-Tag: 0.8.0~8
X-Git-Url: http://git.maemo.org/git/?p=hermes;a=commitdiff_plain;h=aae004ce21efe3434e3a4b2089bebea49189074e

Merge branch 'master' of git@83.233.175.44:hermes

Conflicts:

	package/src/org/maemo/hermes/engine/hermes.py
---

aae004ce21efe3434e3a4b2089bebea49189074e