The svnmerge conflict resolution procedure at r12188 for the dauvergne_protocol module was broken.
The auto-protocol was acquiring the execution lock twice, hence was blocking itself!
Authored by: bugman 2011-01-11
Parent: [r12196]
Child: [r12198]
