asf - Revision 1915946: /portals/pluto/branches/2.1-spi-cleanup