Rev 5660: (vila) Merge 2.2 into 2.3 (including fix for #614713, in file:///home/pqm/archives/thelove/bzr/2.3/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.3/

------------------------------------------------------------
revno: 5660 [merge]
revision-id: pqm at pqm.ubuntu.com-20110820123150-epmi6cndc5lcv8ab
parent: pqm at pqm.ubuntu.com-20110801054736-0s5zojh4cscoxnoj
parent: v.ladeuil+lp at free.fr-20110820092827-9dyakfslp0r3hb1k
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.3
timestamp: Sat 2011-08-20 12:31:50 +0000
message:
  (vila) Merge 2.2 into 2.3 (including fix for #614713,
   #609187 and #812928) (Vincent Ladeuil)
added:
  bzrlib/plugins/launchpad/lp_api_lite.py lp_api_lite.py-20110712150258-dfa3tq91bz14r5ww-1
  bzrlib/plugins/launchpad/test_lp_api_lite.py test_lp_api_lite.py-20110713114529-lurqfgc09yifvs3u-1
modified:
  bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
  bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
  doc/en/release-notes/bzr-2.0.txt bzr2.0.txt-20101008081016-21wd86gpfhllpue3-37
  doc/en/release-notes/bzr-2.1.txt bzr2.1.txt-20101008081016-21wd86gpfhllpue3-38

Diff too large for email (1033 lines, the limit is 1000).