Rev 5557: Re-sync 2.2 and trunk in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5557 [merge]
revision-id: v.ladeuil+lp at free.fr-20101202142238-7u4cswfflhl0q10t
parent: v.ladeuil+lp at free.fr-20101202142149-y5m49f4qxl7dw2do
parent: pqm at pqm.ubuntu.com-20101202141229-wymlgvcy2q6l9zo8
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Thu 2010-12-02 15:22:38 +0100
message:
  Re-sync 2.2 and trunk
-------------- next part --------------