Merge branch 'master' into userinfo userinfo
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Tue, 25 May 2010 12:04:21 +0000 (15:04 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Tue, 25 May 2010 12:04:21 +0000 (15:04 +0300)

Trivial merge