Rev 6580: Merge the 2.5 fix in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 6580 [merge]
revision-id: v.ladeuil+lp at free.fr-20130527102125-x05c4393y0is7jfe
parent: v.ladeuil+lp at free.fr-20130527095738-gxucs86mssyhgnke
parent: pqm at pqm.ubuntu.com-20130527102002-0k9g4cvhocz44chz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2013-05-27 12:21:25 +0200
message:
  Merge the 2.5 fix