Merge branch 'fdn-mods'
authorBenjamin Cama <benoar@dolka.fr>
Sun, 7 Aug 2011 22:35:29 +0000 (00:35 +0200)
committerBenjamin Cama <benoar@dolka.fr>
Sun, 7 Aug 2011 22:35:29 +0000 (00:35 +0200)

Trivial merge