Merge branch 'alexandre/inf7741'
authorJean Privat <jean@pryen.org>
Tue, 2 Oct 2012 20:02:12 +0000 (16:02 -0400)
committerJean Privat <jean@pryen.org>
Tue, 2 Oct 2012 20:02:12 +0000 (16:02 -0400)

Trivial merge