git: Merge branch 'master' into kq_devices

[Samuel Greear]

commit 670c949e1321027348d49d2a805f3dc995341bab
Merge: 8b5c39bbafa92d9c4cc0bb75ed2cf5ab4316f2aa 0e132b2a144870b3a91bf2e44758335d383032f9
Author: Samuel J. Greear <sjg at thesjg.com>
Date:   Mon Jul 12 03:38:36 2010 +0000

    Merge branch 'master' into kq_devices

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/670c949e1321027348d49d2a805f3dc995341bab


-- 
DragonFly BSD source repository