Merge branch 'master' into new_info_panels
authorKaj Wallin <kaj.wallin@ixonos.com>
Fri, 7 May 2010 05:59:49 +0000 (08:59 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Fri, 7 May 2010 05:59:49 +0000 (08:59 +0300)
commit19f133b24c53bbf2fd883e5b15d268cb0707d19d
tree08793c6d7de8a1803b8d4b26a405f7a7399d3dbe
parent26b44bc5d5bc7df9ebe8b33cbfaf3fb4caf21f1e
parentec43d5ff64e283cad799e9264febe7d406a56a3b
Merge branch 'master' into new_info_panels