Merge branch 'zoom_button_drag'
authorKaj Wallin <kaj.wallin@ixonos.com>
Wed, 26 May 2010 13:51:22 +0000 (16:51 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Wed, 26 May 2010 13:51:22 +0000 (16:51 +0300)

Trivial merge