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