Automated merge with https://annotation-tools.googlecode.com/hg/
Automated merge with https://annotation-tools.googlecode.com/hg/

typetools/annotation-tools,typetools/annotation-tools,typetools/annotation-tools,eisop/annotation-tools,eisop/annotation-tools,eisop/annotation-tools