Merge pull request #1983 from LLITCHEV/SystemVStructsCleanup
authorPat Gavlin <pgavlin@gmail.com>
Tue, 17 Nov 2015 17:12:08 +0000 (09:12 -0800)
committerPat Gavlin <pgavlin@gmail.com>
Tue, 17 Nov 2015 17:12:08 +0000 (09:12 -0800)
Fixed a bad merge issue.


Trivial merge