Merge branch 'master' into new_panels_with_context_buttons
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Tue, 24 Aug 2010 09:51:14 +0000 (12:51 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Tue, 24 Aug 2010 09:51:14 +0000 (12:51 +0300)

Trivial merge