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)
commitc4a31ae315fa1468d293ebc72175f912456fe3fb
tree3438bee41c5876821dc9b9a2d9d464fd30e9935e
parent2e55e69b92954c047f5fe512da6f4bd5b82ec1f8
parent4d0a1fb1c2b9b968626eb52749a570606a6a2f86
Merge branch 'master' into new_panels