Merge branch 'zoom-tele-picopix'
authorAntonio Ospite <ao2@ao2.it>
Wed, 7 May 2014 19:40:44 +0000 (21:40 +0200)
committerAntonio Ospite <ao2@ao2.it>
Wed, 7 May 2014 19:40:44 +0000 (21:40 +0200)

Trivial merge