Merge pull request #54 from karlp/th-pull-chipids
authortexane <texane@gmail.com>
Wed, 1 Feb 2012 21:41:57 +0000 (13:41 -0800)
committertexane <texane@gmail.com>
Wed, 1 Feb 2012 21:41:57 +0000 (13:41 -0800)
Unify chip id names, fix warnings


Trivial merge