scala/scala — pull request #1804 by paulp (2012-12-23 14:13:24+00:00)
Title: Fixes for annotations bugs.

This supersedes and renders irrelevant #1802.