Rev 5115: Re-sync 2.2 with 2.1 in http://bazaar.launchpad.net/~vila/bzr/2.2-integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5115 [merge]
revision-id: v.ladeuil+lp at free.fr-20101202125344-wq86bjpx195vhhb8
parent: v.ladeuil+lp at free.fr-20101202125305-b7meiu63xr3pfwt4
parent: pqm at pqm.ubuntu.com-20101202124819-ngzgrzv153115u0i
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.2.3-dev
timestamp: Thu 2010-12-02 13:53:44 +0100
message:
  Re-sync 2.2 with 2.1
-------------- next part --------------