synchronize with current version in fbsd
Authored by: Jean-Francois Dockes 2010-10-29
Parent(s): [033a08]
Child(ren): [e4b1b5]