Merge branch 'master' of https://vcs.maemo.org/git/situare
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Mon, 6 Sep 2010 11:24:36 +0000 (14:24 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Mon, 6 Sep 2010 11:24:36 +0000 (14:24 +0300)
1  2 
src/ui/locationsearchpanel.cpp

Simple merge