Merge commit 'crater/master'
authorThomas Nikolajsen <thomas@dragonflybsd.org>
Mon, 29 Mar 2010 23:33:21 +0000 (01:33 +0200)
committerThomas Nikolajsen <thomas@dragonflybsd.org>
Mon, 29 Mar 2010 23:33:21 +0000 (01:33 +0200)

Trivial merge