Merged r10288:10370 from michaelld/swigpythonargs into trunk. Passes distcheck.