cp -a not -rf
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
Merge branch 'BIGNKPT' into getpkgs

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

Conflicts:
	Makefile
Merge branch 'getpkgs' into gpgsign

* getpkgs:
  not sure if aesni should be in BOOTMODULES too...
  cp -a not -rf

Conflicts:
	Makefile