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