Fix bad merge.
Fix bad merge.

dimfeld/gsutil,GoogleCloudPlatform/gsutil,mattdr/gsutil,GoogleCloudPlatform/gsutil,chriskuehl/gsutil-debian,fishjord/gsutil,dtjackson/gsutil,craigcitro/gsutil,BrandonY/gsutil,ttiurani/gsutil