rope @ f5178198080a

Merge.

author	Steve Losh <steve@stevelosh.com>
date	Tue, 02 Nov 2010 18:23:07 -0400
parents	48cacfdc2ca6
children	(none)

../src/rope/rope