not sure if aesni should be in BOOTMODULES too...
Merge branch 'geli' into BIGNKPT

* geli:
  not sure if aesni should be in BOOTMODULES too...

Conflicts:
	Makefile