Small fix in case someone puts a non-string value in the headers dict.  Fixes #1229.
Merge branch 'develop' of github.com:boto/boto into develop