Merge branch 'master' into new_info_panels
authorKaj Wallin <kaj.wallin@ixonos.com>
Fri, 7 May 2010 05:54:10 +0000 (08:54 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Fri, 7 May 2010 05:54:10 +0000 (08:54 +0300)
commit26b44bc5d5bc7df9ebe8b33cbfaf3fb4caf21f1e
tree6dc98b4a576bfd909ef1f7f11a54a06683e12a60
parentd95acb849cc8a37bd2f1850b4ce4dbb1f1b0d404
parent1e07a9461ddb31d1cdc4d8c6e3f83a5e07463c04
Merge branch 'master' into new_info_panels