Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 1 Dec 2011 19:14:24 +0000 (11:14 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 1 Dec 2011 19:14:24 +0000 (11:14 -0800)

Trivial merge