Merge branch 'master' into new_panels
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 5 Aug 2010 13:36:35 +0000 (16:36 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 5 Aug 2010 13:36:35 +0000 (16:36 +0300)

Trivial merge