Merge branch 'prescc' into next
authorJean Privat <jean@pryen.org>
Thu, 16 May 2013 14:24:02 +0000 (10:24 -0400)
committerJean Privat <jean@pryen.org>
Thu, 16 May 2013 14:24:02 +0000 (10:24 -0400)

Trivial merge