Merge branch 'userinfo'
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Wed, 26 May 2010 12:10:54 +0000 (15:10 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Wed, 26 May 2010 12:10:54 +0000 (15:10 +0300)
commit396d8542e345f69e73519dde304a574a3a0be7ac
treecd392d062be293c924d4cc34e8383628aa356911
parent7745f2095ede6559dca5ef16645e9255af48ec91
parentec0b3c2bce7c76df1c54dbaf0c97468243f2e77f
Merge branch 'userinfo'

Conflicts:
doc/test_cases/functionality-tests.doc
doc/test_cases/functionality-tests.doc
src/ui/mainwindow.cpp