r5718 - trunk/sage/rpc-defs/aviary