Merge branch 'master' of git@wendt.se:hermes
authorFredrik Wendt <fredrik@wendt.se>
Wed, 9 Jun 2010 20:09:56 +0000 (21:09 +0100)
committerFredrik Wendt <fredrik@wendt.se>
Wed, 9 Jun 2010 20:09:56 +0000 (21:09 +0100)
commit5e6ad605b54061576512ece44c3bf87d169b789c
tree8176c5e3be64daeadc0228b782b1bafbf20303e0
parent8cba4541d7533bcbe0eee9b7822c09fc53e66e1a
parent3ef17820e61a58924b5964a3832f6495cf4dfad0
Merge branch 'master' of git@wendt.se:hermes
package/src/org/maemo/hermes/engine/friend.py