From: Jukka Saastamoinen <juksa@czc6303cj1.ixonos.local>
Date: Thu, 15 Apr 2010 10:52:23 +0000 (+0300)
Subject: Merge from master
X-Git-Tag: v0.2~11^2~3^2~1
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=78933620784c805ac4d00fd4091671d290b1f243;p=situare

Merge from master
---

78933620784c805ac4d00fd4091671d290b1f243