Merge branch 'new_panels' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 12 Aug 2010 09:09:38 +0000 (12:09 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 12 Aug 2010 09:09:38 +0000 (12:09 +0300)

Trivial merge