Merge branch 'python2.6' into v1.1.x (explicit format specifiers)
authorW. Trevor King <wking@tremily.us>
Sat, 17 Nov 2012 13:43:27 +0000 (08:43 -0500)
committerW. Trevor King <wking@tremily.us>
Sat, 17 Nov 2012 13:43:27 +0000 (08:43 -0500)

Trivial merge