Merge branch 'fdn-mods'
authorBenjamin Cama <benoar@dolka.fr>
Fri, 16 Sep 2011 15:55:22 +0000 (17:55 +0200)
committerBenjamin Cama <benoar@dolka.fr>
Fri, 16 Sep 2011 15:55:22 +0000 (17:55 +0200)

Trivial merge