From: Matt Helsley <matthltc@us.ibm.com>

With the release of lenny nearing this patch may soon be useful.
Signed-off-by: Matt Helsley <matthltc@us.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>