WorkFlow: Merge 5274,5276,5279-5285 from trunk with svnmerge.py
Authored by: ecarter 2007-04-26
Parent: [r5289]
Child: [r5291]