Comment 7 for bug 930916

Sorry I have not put the correct paths in the patch....