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)

Trivial merge