Rev 4652: Merge cleanup into reports-conflict-resolved in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4652 [merge]
revision-id: v.ladeuil+lp at free.fr-20101111174134-y7ihgny6f2lj5l1h
parent: v.ladeuil+lp at free.fr-20101110111550-hwo8h7gn8s3h6tdn
parent: v.ladeuil+lp at free.fr-20101111174133-xk0ltd3s22avmz20
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reports-conflict-resolved
timestamp: Thu 2010-11-11 18:41:34 +0100
message:
  Merge cleanup into reports-conflict-resolved
-------------- next part --------------