Merge branch 'master' into pan_map
authorSami Rämö <sami.ramo@ixonos.com>
Thu, 3 Jun 2010 06:32:06 +0000 (09:32 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Thu, 3 Jun 2010 06:32:06 +0000 (09:32 +0300)

Trivial merge