Merge branch 'fdn-mods'
authorBenjamin Cama <benoar@dolka.fr>
Fri, 29 Jul 2011 12:54:00 +0000 (14:54 +0200)
committerBenjamin Cama <benoar@dolka.fr>
Fri, 29 Jul 2011 12:54:00 +0000 (14:54 +0200)

Trivial merge