Merged changes from trunk into http_integration branch (r28 - r:31)
Authored by: mikedickey 2008-03-22
Parent: [r31]
Child: [r33]