Rev 5667: (jelmer) Merge bzr/2.2. (Jelmer Vernooij) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.3/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.3/

------------------------------------------------------------
revno: 5667 [merge]
revision-id: pqm at pqm.ubuntu.com-20120618114540-v7ab9n392t8hfpd5
parent: pqm at pqm.ubuntu.com-20120328004246-kx0vzifaqi142b8i
parent: jelmer at samba.org-20120618104126-vtr3l41756jp16nw
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.3
timestamp: Mon 2012-06-18 11:45:40 +0000
message:
  (jelmer) Merge bzr/2.2. (Jelmer Vernooij)