asf - Revision 1920176: /subversion/branches/capabilities-abstraction/notes/tree-conflicts