Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 2 May 2012 01:43:23 +0000 (18:43 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 2 May 2012 01:43:23 +0000 (18:43 -0700)
commit34cc2ca23d8c25881bcb31b46cb184331b18d5eb
treec6a73eb172fc8a6343c6555ec8fb5af7b1555f18
parente06c72d35a57a1566874def502fed33173843483
parenta60655aab59d4feed028cc4fe45e5c777afa7002
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2