remove accidental @class declarations
Merge branch 'source' into build
Build Fri Mar 29 09:51:57 PDT 2013