Merge remote-tracking branch 'crater/DragonFly_RELEASE_3_0' into rel3_0
authorThomas Nikolajsen <thomas@dragonflybsd.org>
Sat, 14 Jul 2012 09:08:13 +0000 (11:08 +0200)
committerThomas Nikolajsen <thomas@dragonflybsd.org>
Sat, 14 Jul 2012 09:08:13 +0000 (11:08 +0200)

Trivial merge