Merge branch 'master' into map_center_point
authorSami Rämö <sami.ramo@ixonos.com>
Tue, 24 Aug 2010 12:47:46 +0000 (15:47 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Tue, 24 Aug 2010 12:47:46 +0000 (15:47 +0300)

Trivial merge