merge RC2
updated makfiles
minor fixes - QEMU compiles now