Merge branch 'fdn-mods'
authorBenjamin Cama <benoar@dolka.fr>
Thu, 15 Sep 2011 21:49:30 +0000 (23:49 +0200)
committerBenjamin Cama <benoar@dolka.fr>
Thu, 15 Sep 2011 21:49:30 +0000 (23:49 +0200)

Trivial merge