Merge remote branch 'boa/pu/optimize_parser' into wip
authorJean Privat <jean@pryen.org>
Wed, 22 Sep 2010 01:51:11 +0000 (21:51 -0400)
committerJean Privat <jean@pryen.org>
Wed, 22 Sep 2010 01:51:11 +0000 (21:51 -0400)

Trivial merge