- the plugin merge broke all sorts of things in this patch.  I cleaned   it up and this version applies cleanly again.  If testing goes well   I will commit it ASAP.
- the plugin merge broke all sorts of things in this patch.  I cleaned
  it up and this version applies cleanly again.  If testing goes well
  I will commit it ASAP.

dbrashear/bochs,dariaphoebe/bochs,dariaphoebe/bochs,dbrashear/bochs,dariaphoebe/bochs,dariaphoebe/bochs,dariaphoebe/bochs,dbrashear/bochs,dbrashear/bochs,dbrashear/bochs