git: Merge branch 'master' of git://git.theshell.com/dragonfly

[Joe Talbott]

commit 1c1822af7fa1a442bc552d83a6710f025fd99331
Merge: 21d2699b7b9761340739f904bdeea9198acff6be 6b4665091b25da4a2467e3f050a09e109fadcff3
Author: Joe Talbott <josepht at zinc.oss.ntelos.net>
Date:   Thu Jan 27 12:52:02 2011 -0500

    Merge branch 'master' of git://git.theshell.com/dragonfly

Summary of changes:

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


-- 
DragonFly BSD source repository