[xtide] (8 commits) ...Merge remote-tracking branch 'origin/f17'

[Mamoru Tasaka]

Summary of changes:

  34cda2d... Update harmonics data to 20120302 (*)
  de17340... Update harmonics data to 20120302 (*)
  b4eaeb3... 2.13 rc2 (*)
  461e0e0... 2.13 rc3 (*)
  8c3fbc6... upload harmonics data again (*)
  aa7fa8c... 2.13 (*)
  eee210c... resolve merge conflict (*)
  19dc597... Merge remote-tracking branch 'origin/f17'

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