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