Merge commit 'crater/master'
authorThomas Nikolajsen <thomas@dragonflybsd.org>
Sat, 21 Jan 2012 20:27:27 +0000 (21:27 +0100)
committerThomas Nikolajsen <thomas@dragonflybsd.org>
Sat, 21 Jan 2012 20:27:27 +0000 (21:27 +0100)
commit27cb24940999a8c7dae2ad2b4d37531b3b7408df
treeabb27de8881a6b502e48a49b1cf13f51c5d896bc
parent5cc8fad5b3725f9d113c200e2b14a990e5022577
parent3e184884618d66845f8b90e6dae483155da6dce6
Merge commit 'crater/master'