Initial annotation support is in SVN trunk