tree 98df4063c1cc5f6321f65bf6d0750b64ff55ec9f
parent 9368323057bac403525234440eedb4710ca5e07a
author Scott Baker <smbaker@gmail.com> 1442267391 -0700
committer Scott Baker <smbaker@gmail.com> 1442267391 -0700

fix variable name conflict