Merge branch 'cryptsetup'

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 8490dc35d67bf7a3ee56b6e2aada285d3590d725,fcdde94167862d29b40c39d35726ac057ed20d3b..340de2c2e1a7ce5d085d6710c52209826f6bdd98
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -5,12 -5,12 +5,18 @@@
  # Distributed under the GPL v2
  # $Id$
  
-   14 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
++  16 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
 +  Release copy_binaries function as public domain.
 +
-   14 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
++  16 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
 +  Handle other binary paths for LVM.
 +
+   16 Apr 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+   Bump version to 3.4.30
+ 
+   16 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+   Support a non-static cryptsetup binary (bug #409277)
+ 
    09 Apr 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
    defaults/keymaps/keymapList, defaults/keymaps/sf.map:
    Add keymap "sf" from Pentoo

diff --cc gen_initramfs.sh
index 3dd757bf10291a9cc2e9ec3d9e31bfbbaf18338f,720a25e89073b1dd20c5c18ca6f5cf1029c51f0e..ca4f090737faee229c95b61b16d9ef3a1fce065e
--- 1/gen_initramfs.sh
--- 2/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@@ -3,16 -3,6 +3,17 @@@
  
  CPIO_ARGS="--quiet -o -H newc"
  
 +# The copy_binaries function is explicitly released into the public domain to
 +# encourage wide adoption and re-use.  That means:
 +# - You may use the code of copy_binaries() as Public domain outside of genkernel
 +# - Past and future changes to copy_binaries() still need to be licensable under
 +#   <GPL v2 or later> to maintain license compatibility with genkernel itself
 +# Written by: 
++# - Sebastian Pipping <sebastian@pipping.org> (partly rewrite)
 +# - Robin H. Johnson <robbat2@gentoo.org> (complete rewrite)
 +# - Richard Yao <ryao@cs.stonybrook.edu> (original concept)
 +# Usage:
 +# copy_binaries DESTDIR BINARIES...
  copy_binaries() {
        local destdir=$1
        shift