- 
Committer:
Andrew Bennetts
 
- 
Date:
2010-01-04 02:25:11 UTC
 
- 
mfrom:
(4634.108.8 2.0)
 
- 
mto:
This revision was merged to the branch mainline in
revision
4928.
 
- 
Revision ID:
andrew.bennetts@canonical.com-20100104022511-2tq2r9w2te84wzgs
 
Merge lp:bzr/2.0 into lp:bzr, including fixes for #343218, #495000, #495023, #494406 and #498378.