Merge branch 'optimize_c_code' into next
authorJean Privat <jean@pryen.org>
Thu, 20 Jan 2011 14:18:56 +0000 (09:18 -0500)
committerJean Privat <jean@pryen.org>
Thu, 20 Jan 2011 14:18:56 +0000 (09:18 -0500)

Trivial merge