Import of http://pysphere.googlecode.com/svn/trunk (r93)