Commit 31a6118175a2a458f88211999952770949e3924c

Arthur Schreiber 2013-05-29T00:02:26

Fix two typos in the merge docs.