Viewing all changes in revision 5524.

Committer: Canonical.com Patch Queue Manager
Date: 2010-11-05 15:10:33 UTC
mfrom: <a title="Merged From 5523.1.1" href="/~bzr-pqm/bzr/bzr.dev/revision/5523.1.1?remember=3641.5.3">(5523.1.1 trunk)
Revision ID: pqm@pqm.ubuntu.com-20101105151033-ozpgdr443dvkzz3j

(vila) Merge 2.2 into trunk resolving conflicts and including fix for
bug #632465 (Vincent Ladeuil)

added added

removed removed