Ticket #2821: Merge
5308,5311-5312,5314,5329,5338-5339,5341,5343-5344,5346,5348-5354,5358-5360,5362 from trunk with svnmerge.py
Authored by: ecarter 2007-05-10
Parent: [r5363]
Child: [r5365]