Commit 546d65a8dae8a7af7288163a580c08c827ebda1d

Russell Belfer 2013-01-02T17:01:34

Fix up spoolandsort iterator usage The spoolandsort iterator changes got sort-of cherry picked out of this branch and so I dropped the commit when rebasing; however, there were a few small changes that got dropped as well (since the version merged upstream wasn't quite the same as what I dropped).