remove merge tags
remove merge tags
Merge pull request #2 from CiscoSystems/folsom-p

Remove merge tags