Disk-drive makers Maxtor and Quantum to merge