Rev 4654: Merge reports-conflict-resolved into 638451-malformed in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4654 [merge]
revision-id: v.ladeuil+lp at free.fr-20101112093353-ilq0luqaqiqp931t
parent: v.ladeuil+lp at free.fr-20101110181706-ffba2jlbzb9vcoii
parent: v.ladeuil+lp at free.fr-20101111174134-y7ihgny6f2lj5l1h
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 638451-malformed
timestamp: Fri 2010-11-12 10:33:53 +0100
message:
  Merge reports-conflict-resolved into 638451-malformed
-------------- next part --------------