WSGI branch: sync with [source:trunk@...].
Authored by: cmlenz 2006-03-03
Parent: [r2951]
Child: [r2953]