Merge branch 'integration' of https://vcs.maemo.org/git/situare into integration
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 3 May 2010 13:17:16 +0000 (16:17 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 3 May 2010 13:17:16 +0000 (16:17 +0300)
commitd7650661fdde5db8a4d7a099a21d58ac7ae1cf83
tree36f56d3e193965e88f5737c9801697ff57e17fc4
parent42773724f3372aa39d8c9cbd04f637ea36483145
parentb3c66486ac57c548b64c7c7d2692054a2d0a5963
Merge branch 'integration' of https://vcs.maemo.org/git/situare into integration