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

[Sepherosa Ziehau]

commit 88cb131568c551d47f7b04eea6931bff5663ba43
Merge: 4da66bb 4d3eb9a
Author: Johannes Hofmann <johannes.hofmann at gmx.de>
Date:   Sat Feb 16 21:50:45 2013 +0100

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

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/88cb131568c551d47f7b04eea6931bff5663ba43


-- 
DragonFly BSD source repository