Merge branch 'master' of git@83.233.175.44:hermes
authorAndrew Flegg <andrew@bleb.org>
Wed, 9 Jun 2010 22:53:04 +0000 (23:53 +0100)
committerAndrew Flegg <andrew@bleb.org>
Wed, 9 Jun 2010 22:53:04 +0000 (23:53 +0100)
commitaae004ce21efe3434e3a4b2089bebea49189074e
treeb0661308754e116cf53fdcb5cb9771b5bc0a3002
parent9845bd3ca78a60f76310d5555ca2ad853fe77150
parent298733f793cad0d770abbbfc12a911f286f981bb
Merge branch 'master' of git@83.233.175.44:hermes

Conflicts:

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