Straighten out mergeinfo.

SVN-Revision: 2018