Merge branch 'master' of git://git.dragonflybsd.org/dragonfly
authorCharlie <root@rem.(none)>
Sun, 19 Dec 2010 16:44:17 +0000 (11:44 -0500)
committerCharlie <root@rem.(none)>
Sun, 19 Dec 2010 16:44:17 +0000 (11:44 -0500)

Trivial merge