Merge remote-tracking branch 'crater/master'
authorThomas Nikolajsen <thomas@dragonflybsd.org>
Thu, 16 Feb 2012 06:35:29 +0000 (07:35 +0100)
committerThomas Nikolajsen <thomas@dragonflybsd.org>
Thu, 16 Feb 2012 06:35:29 +0000 (07:35 +0100)

Trivial merge