mention no-meta merge.  last showstopper done

--HG--
branch : HEAD
2 files changed