Rev 5800: Merge config-lock-branch into config-lock-remote resolving conflicts in file:///home/vila/src/bzr/experimental/config/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/config/

------------------------------------------------------------
revno: 5800 [merge]
revision-id: v.ladeuil+lp at free.fr-20110527081307-81fpggggcfig5b14
parent: v.ladeuil+lp at free.fr-20110526124155-v1h2dow3hocu5u0f
parent: v.ladeuil+lp at free.fr-20110527081141-1ljbvx3v4wdtvruy
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: config-lock-remote
timestamp: Fri 2011-05-27 10:13:07 +0200
message:
  Merge config-lock-branch into config-lock-remote resolving conflicts