rope @ b0cdad7c72af

Merge.

author	Steve Losh <steve@stevelosh.com>
date	Wed, 13 Oct 2010 17:56:28 -0400
parents	48cacfdc2ca6
children	(none)

../src/rope/rope