git: Merge branch 'master' into net80211-update

[Matthew Dillon]

commit 1b2c87ca31619b40819b35bc5430c95daea509a2
Merge: 0f0332d15a22e2caecd871bf053b30bcfa7b08b2 448138f695b7a58b0695703beb380b2f4b300916
Author: Rui Paulo <rpaulo at FreeBSD.org>
Date:   Mon Mar 29 14:07:18 2010 +0100

    Merge branch 'master' into net80211-update
    
    Conflicts:
    	sys/conf/options

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/1b2c87ca31619b40819b35bc5430c95daea509a2


-- 
DragonFly BSD source repository