Merge in Oliver Pinter's PaX/ASLR patches