Merge pull request #3047 from prattmic:python2and3
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 7 Aug 2014 06:38:37 +0000 (06:38 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 7 Aug 2014 06:38:37 +0000 (06:38 +0000)

Trivial merge