Viewing all changes in revision 4797.33.7.

Committer: Canonical.com Patch Queue Manager
Date: 2010-03-24 06:28:26 UTC
mfrom: (4797.40.2 prepare-2.1)
mto: (4797.43.1 2.1) (5110.1.1 integration) (5050.4.1 2.2) (5159.1.1 integration) (5197.1.1 merge-2.1-into-devel) (5241.2.1 trunk) (5258.1.1 diff-header-encoding) (5244.1.1 trunk) (5263.1.1 trunk) (5297.1.1 integration) (5609.33.5 2.3) (6015.55.2 2.4-feature-flags)
mto: This revision was merged to the branch mainline in revision 5118.
Revision ID: pqm@pqm.ubuntu.com-20100324062826-a6jnn6hyvtaqwurj

(mbp) merge 2.0 back to 2.1

added added

removed removed