asf - Revision 1917523: /subversion/branches/remove-log-addressing/notes/tree-conflicts