asf - Revision 1916604: /aries/branches/blueprint-0.3.2-fixes