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