git: Merge remote branch 'crater/master' into net80211-update

[Matthew Dillon]

commit 4ff09c8726c0d349b60430dabcc4c1945962b7e4
Merge: 4578f31197075487109cde9b3f9113ac4d80dcf0 5e79e90c34d396496d36a8ca6eaa72f8415bbb3e
Author: Matthew Dillon <dillon at apollo.backplane.com>
Date:   Fri Mar 5 11:51:34 2010 -0800

    Merge remote branch 'crater/master' into net80211-update

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/4ff09c8726c0d349b60430dabcc4c1945962b7e4


-- 
DragonFly BSD source repository