WorkFlow: Merge in 5308,5311-5312,5314 from trunk with svnmerge.py
Authored by: ecarter 2007-04-30
Parent: [r5314]
Child: [r5316]