-
Committer:
John Arbash Meinel
-
Date:
2010-08-06 19:54:45 UTC
-
mfrom:
(5050.3.21 2.2-final)
-
mto:
This revision was merged to the branch mainline in
revision
5371.
-
Revision ID:
john@arbash-meinel.com-20100806195445-7vsjls3uf8o6t7kt
Merge the 2.2-final branch into trunk, in preparation for release.
Had to fix up one NEWS entry that accidentally got merged into the 2.2 section.