Marcel Gosselin - 2011-01-07

Patch for bug 3096331