Rev 6581: Finish cleanup including merging original Ross fix in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 6581 [merge]
revision-id: v.ladeuil+lp at free.fr-20130527102227-qfc5dwoz41j5fk1z
parent: v.ladeuil+lp at free.fr-20130527102125-x05c4393y0is7jfe
parent: rosslagerwall at gmail.com-20121210144420-kre7zvbak3g6nlx5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2013-05-27 12:22:27 +0200
message:
  Finish cleanup including merging original Ross fix