Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 10 Feb 2012 01:40:00 +0000 (17:40 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 10 Feb 2012 01:40:00 +0000 (17:40 -0800)
commit3aebbe63b9aeacd4eae1b3800555950bc5e05704
tree8d1d427d97201629d2c58113cc266ea89f1012ba
parentdd5552c86a743631ffb153d2d5864d60a40a1724
parentf0206a67719b06b9b36bdb4f92a8431b23bdb0b1
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2