Merge branch 'master' into fix_userinfo fix_userinfo
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Thu, 26 Aug 2010 12:01:33 +0000 (15:01 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Thu, 26 Aug 2010 12:01:33 +0000 (15:01 +0300)

Trivial merge