Merge branch 'master' into userinfo
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Tue, 25 May 2010 08:08:51 +0000 (11:08 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Tue, 25 May 2010 08:08:51 +0000 (11:08 +0300)
commit087f5b4b7ccb34f04c8badca60fddba3c56fc510
tree81d8bdfc3492af7d0eef6ebb6242074213bfa8de
parenta336006d3e0bb87cc950787885bea2d49f6c6ca5
parent4f0d035597d479268ad8e2212b429df7d8394669
Merge branch 'master' into userinfo

Conflicts:
src/ui/userinfopanel.h
src/ui/userpanel.cpp
res/images/user_info_item_bottom.png
res/images/user_info_item_middle.png
res/images/user_info_item_top.png