asf - Revision 1897474: /avalon/tags/RELEASE_402-merge