Merge branch 'fdn-mods'
authorBenjamin Cama <benoar@dolka.fr>
Wed, 17 Aug 2011 15:23:38 +0000 (17:23 +0200)
committerBenjamin Cama <benoar@dolka.fr>
Wed, 17 Aug 2011 15:23:38 +0000 (17:23 +0200)

Trivial merge