recommitting a7e0b8cb6af6063c30b9208aba5b57dc6f8152a8 without bugs
recommitting a7e0b8cb6af6063c30b9208aba5b57dc6f8152a8 without bugs

dankimio/annotate_rails,smtlaissezfaire/annotate_models2,damienmckenna/annotate_models,vickeryj/annotate_models,smtlaissezfaire/annotate_models2,damienmckenna/annotate_models,dustin/annotate_models,vickeryj/annotate_models,dustin/annotate_models