Merge changes from r22a2-branch back into trunk.  Also, change patch
level to 2.2a2+
5 files changed