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