Merged r5547:5542 from jcorgan/num into trunk. Converts from using Python Numeric...