Merge branch 'show_gps_location_on_first_start'
authorVille Tiensuu <ville.tiensuu@ixonos.com>
Wed, 26 May 2010 11:14:00 +0000 (14:14 +0300)
committerVille Tiensuu <ville.tiensuu@ixonos.com>
Wed, 26 May 2010 11:14:00 +0000 (14:14 +0300)

Trivial merge