[smem/f18] (2 commits) ...1.2; no upstream tarball, but tagged in the hg repo.

[Matthew Miller]

Summary of changes:

  683bca2... 1.2; no upstream tarball, but tagged in the hg repo. (*)
  495c496... 1.2; no upstream tarball, but tagged in the hg repo.

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