python @ 7e5a8f221df6

Merge.

author	Steve Losh <steve@stevelosh.com>
date	Thu, 23 Jul 2015 10:41:37 -0400
parents	b1141ff6520a
children	(none)

/usr/bin/python