Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 17 May 2012 18:01:30 +0000 (11:01 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 17 May 2012 18:01:30 +0000 (11:01 -0700)
commitb197a31156e7255af8d2a02fd8782c6705e84ca2
tree0a76a5036ee519a04748eccc2ea02a8dc054a552
parente5b2fce9bfe335ac93128f53985507b0dbf9dac2
parentb96eeefdbef8ad746365c234181372389428cc11
Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into hammer2