* STATUS: Record a conflict (and its resolution) on the 1.7.x-fs-verify group.
* STATUS: Record a conflict (and its resolution) on the 1.7.x-fs-verify group.

git-svn-id: f31f7a5323bbe4a1034a732b81b9abb714edbfbf@1161321 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion