Remove git merge casualty.

Noticed-by: jakub
Merge branch 'freebsd10' of gitserver.ixsystems.com:/git/repos/freenas-build/trueos into freebsd10