Merge branch 'master' into userinfo
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Tue, 25 May 2010 08:29:34 +0000 (11:29 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Tue, 25 May 2010 08:29:34 +0000 (11:29 +0300)
commit7f2a198740a38a04057e5219b22d84441d227dc0
tree16a454c7951863c25c8dd46e65046421974194d6
parent5b06cd7a1e82ec6da5d9160a3dcdd56c835aecab
parent7b5aa8c6ca40ff62b7c5c53abacc26c1fa3e2c4d
Merge branch 'master' into userinfo

Conflicts:
images.qrc
src/ui/userinfopanel.cpp
images.qrc
src/ui/userinfopanel.cpp