* TODO-1.6: Make issue #3322 a 1.6 blocker. Also, mention that tree conflicts    should be delayed till 1.7 if essential tree-conflict-related blocker tasks    are not resolved by the time we branch 1.6.    Note: This is *my* view on it. If you disagree with delaying to 1.7 because    of any current blockers, please let me know so we can discuss this.
* TODO-1.6: Make issue #3322 a 1.6 blocker. Also, mention that tree conflicts
   should be delayed till 1.7 if essential tree-conflict-related blocker tasks
   are not resolved by the time we branch 1.6.
   Note: This is *my* view on it. If you disagree with delaying to 1.7 because
   of any current blockers, please let me know so we can discuss this.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@874324 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion