Branch merge
authorÉric Araujo <merwok@netwok.org>
Tue, 3 Jul 2012 05:13:40 +0000 (01:13 -0400)
committerÉric Araujo <merwok@netwok.org>
Tue, 3 Jul 2012 05:13:40 +0000 (01:13 -0400)

Trivial merge