Merge branch 'master' into net80211-update
authorRui Paulo <rpaulo@FreeBSD.org>
Wed, 24 Feb 2010 15:47:06 +0000 (15:47 +0000)
committerRui Paulo <rpaulo@FreeBSD.org>
Wed, 24 Feb 2010 15:47:06 +0000 (15:47 +0000)

Trivial merge