Merge branch 'master' into new_info_panels
authorKaj Wallin <kaj.wallin@ixonos.com>
Mon, 10 May 2010 05:23:03 +0000 (08:23 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Mon, 10 May 2010 05:23:03 +0000 (08:23 +0300)
commit223ff28d8a918390975e512abceafc21866cba11
tree09bc7ad992c52e42d6874342aa4873a1b18e5b15
parenta4724d8a4592dfc728910717e3df281cbbab7551
parent8c2a56d6438a849e7d180b7ee6f9dfce498cdaf9
Merge branch 'master' into new_info_panels