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)

Trivial merge