fixes mistakes in annotations from previous merge
fixes mistakes in annotations from previous merge

jnehlmeier/threetenbp,naixx/threetenbp,ThreeTen/threetenbp,ThreeTen/threetenbp,pepyakin/threetenbp,naixx/threetenbp,jnehlmeier/threetenbp,pepyakin/threetenbp