Improved scatter argument handling; a few cleanups
Authored by: efiring 2007-04-07
Parent: [r3165]
Child: [r3167]