Merge branch 'master' into new_panels
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Tue, 10 Aug 2010 12:21:19 +0000 (15:21 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Tue, 10 Aug 2010 12:21:19 +0000 (15:21 +0300)

Trivial merge