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