Fix for http://jira.codehaus.org/browse/MRELEASE-812

Signed-off-by: Fred Bricon <fbricon@gmail.com>