Rev 4873: Resync fix 2.0 in http://bazaar.launchpad.net/~vila/bzr/2.1-integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/2.1-integration/

------------------------------------------------------------
revno: 4873 [merge]
revision-id: v.ladeuil+lp at free.fr-20101202115641-dn8lo9f95of7db42
parent: v.ladeuil+lp at free.fr-20101202114231-sbxxwd0czlwh2xo1
parent: pqm at pqm.ubuntu.com-20101202115245-mwioogw6oykdq05n
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.1.4-dev
timestamp: Thu 2010-12-02 12:56:41 +0100
message:
  Resync fix 2.0
-------------- next part --------------