Commit 504a4fd140223e17871e219ae17568b303c7c9a1

Edward Thomson 2013-05-28T14:12:55

Merge pull request #1615 from arthurschreiber/patch-1 Fix two typos in the merge docs.