johnfargo Thu, 29 Oct 2009 18:13:21 -0700
Integrates Jon Weygandt's changes from http://codereview.appspot.com/144055
http://codereview.appspot.com/143046