Viewing all changes in revision 6437.23.18.

Committer: Patch Queue Manager
Date: 2012-02-27 16:19:13 UTC
mfrom: (6437.39.1 2.5_2.4_integration)
mto: (6476.1.2 dev_2.5_integration) (6437.54.1 2.5) (6492.1.1 trunk) (6498.1.1 trunk) (6507.1.1 trunk) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6478.
Revision ID: pqm@pqm.ubuntu.com-20120227161913-pfpem5e6nop05m6d

(gz) Merge 2.4 for one more test fix with newer zlib (Martin Packman)

added added

removed removed