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