Rev 4533: (jml) Merge in changes from 1.17 branch. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4533 [merge]
revision-id: pqm at pqm.ubuntu.com-20090714111244-zzen702pevyjugjr
parent: pqm at pqm.ubuntu.com-20090714080429-2qoaeztpc0v3eng8
parent: jml at canonical.com-20090714101230-hle1r0kkghib68v0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-07-14 12:12:44 +0100
message:
  (jml) Merge in changes from 1.17 branch.