Merge branch 'fdn-mods'
authorBenjamin Cama <benoar@dolka.fr>
Mon, 8 Aug 2011 11:51:59 +0000 (13:51 +0200)
committerBenjamin Cama <benoar@dolka.fr>
Mon, 8 Aug 2011 11:51:59 +0000 (13:51 +0200)

Trivial merge