Merge remote branch 'rpaulo/net80211-update'
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 14 Apr 2010 15:30:28 +0000 (08:30 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 14 Apr 2010 15:30:28 +0000 (08:30 -0700)

Trivial merge