Merge branch 'ff/traffic'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 9 Jul 2006 10:38:44 +0000 (12:38 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 9 Jul 2006 10:38:44 +0000 (12:38 +0200)

Trivial merge