This fixes some IA-64 related bugs.
until I've made the commits to resolve the conflicts. Submitted by: Doug Rabson <dfr>