Merge branch 'master' into new_panels
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Mon, 9 Aug 2010 07:56:57 +0000 (10:56 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Mon, 9 Aug 2010 07:56:57 +0000 (10:56 +0300)
commitfbe0b7ab1fb5e40593413f7c9f03fa87238094fd
tree162af2d534df227048d7b639e90843486dd12581
parentc4a31ae315fa1468d293ebc72175f912456fe3fb
parent533f6b3aac8291f23a5032f181541780a1d724db
Merge branch 'master' into new_panels