asf - Revision 1917539: /subversion/branches/authz-overhaul/notes/tree-conflicts