-
Committer:
Brian Granger
-
Date:
2009-03-23 15:54:00 UTC
-
mfrom:
(1160 ipython)
-
mto:
This revision was merged to the branch mainline in
revision
1161.
-
Revision ID:
ellisonbg@gmail.com-20090323155400-rl6u4nwi673pquh8
Merging latest trunk.
I got a criss-cross merge in this and did merge --weave. Hope this is
OK.