Merging rr222376: ------------------------------------------------------------------------ r222376 | majnemer | 2014-11-19 11:36:18 -0800 (Wed, 19 Nov 2014) | 3 lines
Merging rr222376:
------------------------------------------------------------------------
r222376 | majnemer | 2014-11-19 11:36:18 -0800 (Wed, 19 Nov 2014) | 3 lines

AliasSet: Simplify mergeSetIn

No functional change intended.
------------------------------------------------------------------------


git-svn-id: 1a981f132218c5d985e5b5a896e7a8b8201781d6@223635 91177308-0d34-0410-b5e6-96231b3b80d8

chubbymaggie/asap,chubbymaggie/asap,chubbymaggie/asap,chubbymaggie/asap,chubbymaggie/asap,chubbymaggie/asap