Merge Trillian patches (Linux ia64)
16 files changed