Merged code from main Mercurial repository at
https://code.google.com/p/google-api-python-client/