Trying to fix the bloody cat!
Merge branch 'master' of http://github.com/Calnex/Optware