Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorSamuel J. Greear <sjg@thesjg.com>
Sun, 2 Jan 2011 15:14:55 +0000 (15:14 +0000)
committerSamuel J. Greear <sjg@thesjg.com>
Sun, 2 Jan 2011 15:14:55 +0000 (15:14 +0000)

Trivial merge