Merged changes from the trunk into the xhtml branch
Authored by: jimwinston 2010-02-25
Parent: [r699]
Child: [r701]