Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 28 Apr 2013 07:49:09 +0000 (00:49 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 28 Apr 2013 07:49:09 +0000 (00:49 -0700)

Trivial merge