Merge branch 'master' into new_panels
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Wed, 11 Aug 2010 14:25:54 +0000 (17:25 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Wed, 11 Aug 2010 14:25:54 +0000 (17:25 +0300)
commitfb4162c58358bca9ff01b3a858189483295b3265
tree836d956c8c8c5c0f9603d567ee8568306e0662b9
parent1808c84a91d26f59b78c1b2262a16dddacddc550
parentedbe323cc29f6899c919a1aee9532f004f57de81
Merge branch 'master' into new_panels