Merge remote branch 'jean-sebastien/fix-test-icode' into next
authorJean Privat <jean@pryen.org>
Tue, 4 Jan 2011 17:35:37 +0000 (12:35 -0500)
committerJean Privat <jean@pryen.org>
Tue, 4 Jan 2011 17:39:52 +0000 (12:39 -0500)

Trivial merge