r5664 - branches/tmckay/sage/python/sage/aviary