rope @ b811396371c8

Merge.

author	Steve Losh <steve@stevelosh.com>
date	Thu, 22 Sep 2011 20:52:57 -0400
parents	48cacfdc2ca6
children	(none)

../src/rope/rope