[xtide/f17] (8 commits) ...resolve merge conflict

[Mamoru Tasaka]

Summary of changes:

  34b50c8... Update harmonics data to 20120302 (*)
  a1a8fba... Update harmonics data to 20120302 (*)
  4f1e344... 2.13 rc2 (*)
  f01e491... 2.13 rc3 (*)
  55b1b49... upload harmonics data again (*)
  a7a03fa... 2.13 (*)
  3666664... F-18: Mass rebuild (*)
  eee210c... resolve merge conflict

(*) This commit already existed in another branch; no separate mail sent