[Merge] ~kondor-dani/compiz:annotate_fix2 into compiz:master

[Dmitry Shachnev]

> revert change of return type of AnnoScreen::drawText()

Maybe you can squash this into the commit that changed the return type?

Otherwise, looks good to me. Alberts, what do you think?
-- 
https://code.launchpad.net/~kondor-dani/compiz/+git/compiz/+merge/383958
Your team Compiz Maintainers is subscribed to branch compiz:master.