Merge branch 'devel'
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Tue, 11 Oct 2011 13:38:35 +0000 (21:38 +0800)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Tue, 11 Oct 2011 13:38:35 +0000 (21:38 +0800)
commit10c9bcda5cb69da196c760cfc280c058a6eeb154
treea3bb716d7fbd0a68cae22f4568751fc9d1bfa954
parent97a2109d39c99bc49e77e3ef63278c85c2dc5061
parentabf21138fc9d6b9536faf556858abf264f704f26
Merge branch 'devel'