- update patch so it apply cleanly. I will commit it to the cvs,   so we can easily revert it.
- update patch so it apply cleanly. I will commit it to the cvs,
  so we can easily revert it.

marmolejo/bochs-zet,marmolejo/bochs-zet,marmolejo/bochs-zet,marmolejo/bochs-zet,marmolejo/bochs-zet