[PATCH] merge patch from  http://code.google.com/p/pysphere/issues/detail?id=47