I made this patch to fix this problem on my Mac. It worked on both my ubuntu box and Mac (Lion), but I am not sure if it could work on other OSs.