Rev 4658: Merge cleanup into description in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4658 [merge]
revision-id: v.ladeuil+lp at free.fr-20100104143605-vaqbfoyj3l5ac3tg
parent: v.ladeuil+lp at free.fr-20100104142134-1to6g6c2fs0yj1b0
parent: v.ladeuil+lp at free.fr-20100104143322-umzmc7r7uusohw4s
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: description
timestamp: Mon 2010-01-04 15:36:05 +0100
message:
  Merge cleanup into description
-------------- next part --------------