python @ fb9ef461ca17

Merge.

author	Steve Losh <steve@stevelosh.com>
date	Mon, 26 Aug 2013 20:02:37 -0400
parents	b1141ff6520a
children	(none)

/usr/bin/python