Merge pull request #3747 from StevenPuttemans:fix_annotationtool_extras
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 25 Feb 2015 12:10:31 +0000 (12:10 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 25 Feb 2015 12:10:31 +0000 (12:10 +0000)

Trivial merge