Merge branch 'master' into new_zoom_buttons_panel
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 14 May 2010 06:44:33 +0000 (09:44 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 14 May 2010 06:44:33 +0000 (09:44 +0300)
commitd08a150d569a0b9dcfe4cc8f7b5daa79b45f09a4
tree7ba52af06f20fadab835f68184115a82ce14ed76
parent636fa97ecf7dda23df59ec7de9e891e61cbaadd0
parent1e5b1e03ea3fddf1b5dc0c30201851bc7984555b
Merge branch 'master' into new_zoom_buttons_panel