Merge branch 'bug-418463'

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 76102bdb9fc174654cbb06c1ca64bf5a131105ea,6047d4f62b989d1b7b812b3bc644f685be381c78..016128a065dccb299ef509026a34b77ddb6ab1d9
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -5,11 -5,9 +5,14 @@@
  # Distributed under the GPL v2
  # $Id$
  
+   02 Jun 2012; Sebastian Pipping <sping@gentoo.org> defaults/linuxrc:
+   Support bind mounts from /etc/initramfs.mounts (bug #418463)
+ 
 +  02 Jun 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/modules_load,
 +  arch/x86_64/modules_load, defaults/modules_load:
 +  Make sure that cbc.ko and aes*.ko needed for cbc-essiv:sha256 (=default) disk
 +  encryption are included with the initramfs (bug #416973)
 +
    28 May 2012; Sebastian Pipping <sping@gentoo.org> gen_funcs.sh:
    Fix an e2fsprogs compilation leftover (bug #417095), reported by Juergen Rose