Merge branch 'master' of git@83.233.175.44:hermes
authorAndrew Flegg <andrew@bleb.org>
Wed, 9 Jun 2010 21:38:54 +0000 (22:38 +0100)
committerAndrew Flegg <andrew@bleb.org>
Wed, 9 Jun 2010 21:38:54 +0000 (22:38 +0100)
1  2 
package/src/org/maemo/hermes/engine/friend.py
package/src/org/maemo/hermes/engine/hermes.py