Merge branch 'distutils' into release
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 27 Apr 2011 21:04:14 +0000 (17:04 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 27 Apr 2011 21:04:14 +0000 (17:04 -0400)

Trivial merge