Merge branch 'master' into map_double_click_zoom map_double_click_zoom
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 22 Jun 2010 12:52:25 +0000 (15:52 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 22 Jun 2010 12:52:25 +0000 (15:52 +0300)

Trivial merge