add 64-bit imake include path
dummy commit
merge trunk