Merge "Fixes pep8 nit"

This commit is contained in:
Jenkins 2012-11-27 09:05:13 +00:00 committed by Gerrit Code Review
commit 815011fee6