Merge branch 'master' into net80211-update
authorRui Paulo <rpaulo@FreeBSD.org>
Tue, 13 Apr 2010 18:34:34 +0000 (19:34 +0100)
committerRui Paulo <rpaulo@FreeBSD.org>
Tue, 13 Apr 2010 18:34:34 +0000 (19:34 +0100)

Trivial merge