Merge branch 'clean-c' into wip
authorJean Privat <jean@pryen.org>
Wed, 30 May 2012 16:39:41 +0000 (12:39 -0400)
committerJean Privat <jean@pryen.org>
Wed, 30 May 2012 16:39:41 +0000 (12:39 -0400)

Trivial merge