wine 32 config, java6 path, fix trayer script
merge from upstream