rope @ e31391abee4c

Merge.

author	Steve Losh <steve@stevelosh.com>
date	Wed, 27 Oct 2010 09:25:52 -0400
parents	48cacfdc2ca6
children	(none)

../src/rope/rope