Branch merge
authorÉric Araujo <merwok@netwok.org>
Tue, 15 Nov 2011 15:12:49 +0000 (16:12 +0100)
committerÉric Araujo <merwok@netwok.org>
Tue, 15 Nov 2011 15:12:49 +0000 (16:12 +0100)

Trivial merge