Merge branch 'master' into userinfo_collapse
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 27 Aug 2010 12:41:19 +0000 (15:41 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Fri, 27 Aug 2010 12:41:19 +0000 (15:41 +0300)

Trivial merge