Replay changeset 70238:03e488b5c009 from fubar branch. Original commit

message:

Reconcile with the 2.6svn branch.  The 2.6.7 release will be made from
Subversion, but there were differences, so this brings them in sync.  These
changes should *not* propagate to any newer versions.

__init__.py

@@ -22,5 +22,5 @@ __revision__ = "$Id$"
 #
 
 #--start constants--
-__version__ = "2.6.6"
+__version__ = "2.6.7rc1"
 #--end constants--