Merged r4681 from trunk (missing fixtures breaking tests).
Authored by: jplang 2011-01-16
Parent: [r4731]
Child: [r4733]