asf - Revision 1821730: /avalon/tags/RELEASE_402-before-merge