Merge branch 'boehm' into wip
authorJean Privat <jean@pryen.org>
Mon, 18 Jun 2012 21:30:09 +0000 (17:30 -0400)
committerJean Privat <jean@pryen.org>
Mon, 18 Jun 2012 21:30:09 +0000 (17:30 -0400)

Trivial merge