Branch merge
authorÉric Araujo <merwok@netwok.org>
Mon, 5 Mar 2012 15:25:40 +0000 (16:25 +0100)
committerÉric Araujo <merwok@netwok.org>
Mon, 5 Mar 2012 15:25:40 +0000 (16:25 +0100)

Trivial merge