This is a version of the patch in http://codereview.appspot.com/4277082/ that is suitable for landing on trunk.
This is a version of the patch in http://codereview.appspot.com/4277082/ that is suitable for landing on trunk.

Review URL: http://codereview.appspot.com/4332043

riannucci/rietveldv2,riannucci/rietveldv2