Merge branch 'master' into new_panels_with_context_buttons
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 19 Aug 2010 12:12:02 +0000 (15:12 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 19 Aug 2010 12:12:02 +0000 (15:12 +0300)
commit2d9a0f4c0d7c30f906639a2c7158aa3f8665e2fa
tree2edfa6d0437e9e5699a3e9a49981a3bc05536235
parent83799b50045231f28d96c0c67dc453bc65f885b1
parente5543cb26ae6f02ad067fb8aa0e63a36687c1a40
Merge branch 'master' into new_panels_with_context_buttons