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)
commitb6b191c319816eaad5bd788953bc8570bf1fd7fc
tree419de217e1e15c429c55492bd5fc58f88f70a7da
parentf4d35a5ccb86127d44aa73d44349773b0d4f3ed1
parent51aab9d8d3713398c8d66807e784fe3d79cfa564
Merge branch 'master' into userinfo_collapse