git: Merge branch 'master' of git://git.dragonflybsd.org/dragonfly into wlan_serialize

[Sepherosa Ziehau]

commit 2267fd784e8a7d1ca13e6d3541caa91f36c9e9fb
Merge: ed48190 27a084b
Author: Johannes Hofmann <johannes.hofmann at gmx.de>
Date:   Tue Mar 5 17:04:52 2013 +0100

    Merge branch 'master' of git://git.dragonflybsd.org/dragonfly into wlan_serialize

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/2267fd784e8a7d1ca13e6d3541caa91f36c9e9fb


-- 
DragonFly BSD source repository