Merge branch 'master' into pan_map
authorSami Rämö <sami.ramo@ixonos.com>
Tue, 1 Jun 2010 05:45:04 +0000 (08:45 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Tue, 1 Jun 2010 05:45:04 +0000 (08:45 +0300)

Trivial merge