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)
commit0ca9236c888b63615814ddd1312cdcf2869aa299
tree2cad8d8839906bb901413003c2367745a11a1010
parent8fd3b9f60db8f667f2c261a64a2c65552f888ed8
parentbec098e2ad4d938d8061e5095c254daa8251a014
Merge commit 'crater/master'