Merge git://git.dragonflybsd.org/dragonfly
authorVenkatesh Srinivas <me@endeavour.zapto.org>
Mon, 12 Dec 2011 01:21:35 +0000 (17:21 -0800)
committerVenkatesh Srinivas <me@endeavour.zapto.org>
Mon, 12 Dec 2011 01:21:35 +0000 (17:21 -0800)
commit522120720f895f17f7ab9b1d58b89d96e3968dd4
tree4570a21d74c1443f83e19fc37a9c7a54456e49b9
parentfa88cd5aa170a1a7ee7092c780deb31535372277
parenta3dce641b4c45832281677315c0547d96e240b58
Merge git://git.dragonflybsd.org/dragonfly