rope @ cffc630cdd07

Merge.

author	Steve Losh <steve@stevelosh.com>
date	Thu, 13 Jan 2011 00:02:54 -0500
parents	48cacfdc2ca6
children	(none)

../src/rope/rope