Merge branch 'master' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 4 Aug 2010 05:06:36 +0000 (08:06 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 4 Aug 2010 05:06:36 +0000 (08:06 +0300)

Trivial merge