Merge in scanner code.
authorBrian Aker <brian@tangent.org>
Tue, 5 Apr 2011 01:25:44 +0000 (18:25 -0700)
committerBrian Aker <brian@tangent.org>
Tue, 5 Apr 2011 01:25:44 +0000 (18:25 -0700)

Trivial merge