Merge branch 'fix-docache'

Conflicts:
	ChangeLog

diff --cc ChangeLog
index a1a3aabdd344107c9071d74bb42632fec13020f2,f83809bbb04c27691a759e5051d5ef201826d9d0..912f7b7200d084072c7c820cf6a6c2886eb580e9
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -5,24 -5,10 +5,28 @@@
  # Distributed under the GPL v2
  # $Id$
  
 -  17 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
 +  29 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
 +  Restore original /dev/tty after GPG (bug #410073), report and initial patch
 +  by Brendan Pike
 +
 +  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
 +  Bump version to 3.4.27
 +
 +  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
 +  Fail hard on LUKS inclusion error (bug #409277), advise about
 +  sys-fs/cryptsetup[static], drop support for cryptsetup binary from /bin/
 +
 +  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> gen_funcs.sh,
 +  gen_initramfs.sh:
 +  Make errors stand out more
 +
++  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
+   defaults/linuxrc:
+   Fix docache (bug #397309)
+ 
 +  22 Mar 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
 +  Bump version to 3.4.26
 +
    16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
    defaults/linuxrc:
    Drop into debug shell when squashfs could not be mounted

diff --cc defaults/initrd.scripts
Simple merge