Merge branch 'crosshair2' of https://vcs.maemo.org/git/situare into crosshair2
authorVille Tiensuu <ville.tiensuu@ixonos.com>
Mon, 17 May 2010 11:24:20 +0000 (14:24 +0300)
committerVille Tiensuu <ville.tiensuu@ixonos.com>
Mon, 17 May 2010 11:24:20 +0000 (14:24 +0300)
commit51d9b2c47fdb5b53cffd29af9f483c0dcc24c911
treee7b5d587942628ca9f8128bc792c4bfba3d17c59
parent7836dd30d23724cf8416e50077acc07f9fb7124a
parentab26c51d851a61851ec1d3323b774b0fb92e4b89
Merge branch 'crosshair2' of https://vcs.maemo.org/git/situare into crosshair2