Branch merge
authorÉric Araujo <merwok@netwok.org>
Wed, 27 Apr 2011 14:25:27 +0000 (16:25 +0200)
committerÉric Araujo <merwok@netwok.org>
Wed, 27 Apr 2011 14:25:27 +0000 (16:25 +0200)

Trivial merge