Merge branch 'devel'
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Tue, 14 Jun 2011 08:42:37 +0000 (16:42 +0800)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Tue, 14 Jun 2011 08:42:37 +0000 (16:42 +0800)
commit2fc6b7e534de65984cf15236c0d7b0de40e4050f
treed9eb210f58b129a087b00a2a9d3795421f06236f
parent08f919e5554b3e5c957ff53557b59b4e73bc4c92
parent43441c2104cef1db56e64f1d95b252359a554211
Merge branch 'devel'