asf - Revision 1939628: /subversion/merged