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

Trivial merge