Merge branch 'master' of https://vcs.maemo.org/git/hermes
authorFredrik Wendt <fredrik@wendt.se>
Tue, 8 Jun 2010 22:00:14 +0000 (23:00 +0100)
committerFredrik Wendt <fredrik@wendt.se>
Tue, 8 Jun 2010 22:00:14 +0000 (23:00 +0100)
commit98f0a022e68e745b15656dabbeab13988a182bf0
treeacba78ca7b9045fcab7ad3db1e2f1923a9fc7f9c
parent22607ab4879f75dc8d9af5304a25220d9fd32f11
parent589593a6b1321355d6a5ca0dca4d480b3df8edad
Merge branch 'master' of https://vcs.maemo.org/git/hermes