Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 28 Dec 2008 23:35:37 +0000 (15:35 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 28 Dec 2008 23:35:37 +0000 (15:35 -0800)

Trivial merge