Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 17 May 2012 00:15:51 +0000 (17:15 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 17 May 2012 00:15:51 +0000 (17:15 -0700)
commitc95f6392da1cc202799a80494e34f5ed7eb707e1
tree13cabf4843aa020924b235e2f63ead574ee18542
parentb2b78aaa870ae0fb07df142a8c7c05f7ff2e804d
parent0dc51cc97257ec97e7ff7061f462746dde643313
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2