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

[Patch Queue Manager]

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

------------------------------------------------------------
revno: 6070 [merge]
revision-id: pqm at pqm.ubuntu.com-20120618134851-n3dpvyjg9hl3ph95
parent: pqm at pqm.ubuntu.com-20120329104349-70dq6u8qbionntav
parent: jelmer at samba.org-20120618104331-8optjez3e08xb9or
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.4
timestamp: Mon 2012-06-18 13:48:51 +0000
message:
  (jelmer) Merge 2.3. (Jelmer Vernooij)