Merge util
authorBrian Aker <brian@tangent.org>
Tue, 19 Jul 2011 05:29:09 +0000 (22:29 -0700)
committerBrian Aker <brian@tangent.org>
Tue, 19 Jul 2011 05:29:09 +0000 (22:29 -0700)

Trivial merge