Merge commit 'crater/master'
authorSimon Schubert <corecode@dragonflybsd.org>
Fri, 28 Aug 2009 10:33:13 +0000 (12:33 +0200)
committerSimon Schubert <corecode@dragonflybsd.org>
Fri, 28 Aug 2009 10:33:13 +0000 (12:33 +0200)

Trivial merge