Updated tag sprint7-stable with recent changes.
Authored by: briggs@adobe.com 2009-11-03
Parent: [r432]
Child: [r434]