Merge from FreeBSD: minor geli enhancement
Authored by: bsdimp 2010-10-21
Parent: [r5481]
Child: [r5483]