git: hammer2 Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2

[Matthew Dillon]

commit e1648a68d2a340848f1c8ec7bd695c6285927392
Merge: 1a34728 d6a0237
Author: Matthew Dillon <dillon at apollo.backplane.com>
Date:   Sat Aug 11 14:56:01 2012 -0700

    Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/e1648a68d2a340848f1c8ec7bd695c6285927392


-- 
DragonFly BSD source repository