Merge branch 'dev_puontsi' into master_merge
authorSimo Puonti <Simo.Puonti@ixonos.com>
Thu, 28 May 2009 05:56:04 +0000 (08:56 +0300)
committerSimo Puonti <Simo.Puonti@ixonos.com>
Thu, 28 May 2009 05:56:04 +0000 (08:56 +0300)

Trivial merge