Code

Merge branch 'sh/freebsd'
authorFlorian Forster <octo@crystal.wlan.home.verplant.org>
Wed, 7 Feb 2007 12:58:55 +0000 (13:58 +0100)
committerFlorian Forster <octo@crystal.wlan.home.verplant.org>
Wed, 7 Feb 2007 12:58:55 +0000 (13:58 +0100)

Trivial merge