git: Merge branch 'master' into net80211-update

[Matthew Dillon]

commit 194dfa74a62d88bd37a584bf572531da1ff44ee1
Merge: 4578f31197075487109cde9b3f9113ac4d80dcf0 b8237e23e62603fbf8951cfb7763999e1404afc2
Author: Rui Paulo <rpaulo at FreeBSD.org>
Date:   Thu Mar 18 02:19:10 2010 +0000

    Merge branch 'master' into net80211-update

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/194dfa74a62d88bd37a584bf572531da1ff44ee1


-- 
DragonFly BSD source repository