Was introduced in http://codereview.appspot.com/5399053/
umpf, yes, there's something wrong with my Emacs setup. It stopped detecting the correct indentation some days ago :( LGTM
BTW, do you have a buildbot running that runs pylint and the unittests?