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

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5135 [merge]
revision-id: pqm at pqm.ubuntu.com-20110820090216-xrqcq4me2nstw4to
parent: pqm at pqm.ubuntu.com-20110705130637-x1up9qll69s6fal9
parent: v.ladeuil+lp at free.fr-20110820074534-dxu5tnoy1p6bsbnt
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.2
timestamp: Sat 2011-08-20 09:02:16 +0000
message:
  (vila) Merge 2.1 into 2.2 (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:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
  bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6

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