MarkUsProject/Markus — pull request #841 by mina (2012-09-28 17:13:31+00:00)
Title: Fix for annotations

The annotations are broken on markus from my previous merge. This fixes them again. Sorry about that.