[Checkins] SVN: zc.queue/branches/andrew-conflict-resolution-persistent/ branch for fixing the issue where conflict resolver doesn't do the job well in case persistent objects are in a queue.

[Andrew Sung]

Log message for revision 123976:
  branch for fixing the issue where conflict resolver doesn't do the job well in case persistent objects are in a queue.
  
  

Changed:
  A   zc.queue/branches/andrew-conflict-resolution-persistent/

-=-