Merge branch 'master' into new_zoom_buttons_panel
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 14 May 2010 06:44:33 +0000 (09:44 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 14 May 2010 06:44:33 +0000 (09:44 +0300)

Trivial merge