New branch to merge changes from trunk for release-2.5
Authored by: slruiz1 2010-09-08
Parent: [r482]
Child: [r484]