Roberto Perez - 2009-11-08

Patch to bug id: 2874490