until I've made the commits to resolve the conflicts. Submitted by: Doug Rabson <dfr>
this is heavily stripped down.