Merge

dev/tsunami_pchip.cc:
    SCCS merged

--HG--
extra : convert_revision : 064e3bab82aacf813d1f049d72429fd990608044

diff --cc dev/ide_disk.cc
Simple merge

diff --cc dev/ide_disk.hh
Simple merge

diff --cc dev/tsunami_pchip.cc
Simple merge

diff --cc dev/tsunami_pchip.hh
Simple merge