Backed out r7541 which broke the build.
Authored by: emassip 2011-09-27
Parent: [r7541]
Child: [r7543]
