Merge branch 'parser' into wip
authorJean Privat <jean@pryen.org>
Sun, 24 Jun 2012 20:50:28 +0000 (16:50 -0400)
committerJean Privat <jean@pryen.org>
Sun, 24 Jun 2012 20:50:28 +0000 (16:50 -0400)

Trivial merge