Rev 5656: Merge 2.2 into 2.3 in http://bazaar.launchpad.net/~vila/bzr/2.3-integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5656 [merge]
revision-id: v.ladeuil+lp at free.fr-20110714153851-9dilylc8gxevfa47
parent: pqm at pqm.ubuntu.com-20110714131108-0oitiz2v9yzpp5sm
parent: pqm at pqm.ubuntu.com-20110705130637-x1up9qll69s6fal9
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.3.4-dev
timestamp: Thu 2011-07-14 17:38:51 +0200
message:
  Merge 2.2 into 2.3