asf - Revision 1923213: /subversion/branches/shelve-checkpoint3/notes/merge-tracking