Comment 7 for bug 1071492

Sorry, should have compiled the patch here before sending it :-)

I uploaded a newer version of the patch that should compile correctly.