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

[Matthew Dillon]

commit 609a8021a553a01c201131e4380378efac634f40
Merge: 1ad77ed c81f97e
Author: Matthew Dillon <dillon at apollo.backplane.com>
Date:   Wed Jun 6 22:42:56 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/609a8021a553a01c201131e4380378efac634f40


-- 
DragonFly BSD source repository