Merge branch 'master' into with-dns-bl
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 4 Oct 2008 13:23:09 +0000 (15:23 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 4 Oct 2008 13:23:09 +0000 (15:23 +0200)

Trivial merge