Reworked patch from Gustavo Zacharias to make it apply to this version Signed-off-by: Gilles Talis <gilles.talis@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>