Merge branch 'bug-421027'

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 1340d09dc6b3e9d68aa0e46b3ec41339f92db288,7b90ca8bbb0af9f59817742ce2287a8b1c6d50e3..87332a74699d0aefabb556c83501a7b2d40640ee
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -5,9 -5,10 +5,13 @@@
  # Distributed under the GPL v2
  # $Id$
  
+   01 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh,
+   gen_package.sh:
+   Support --kernel-config=/proc/config.gz (bug #421027)
+ 
 +  08 Jul 2012; Kenny Cheng <kenny97821419@gmail.com> defaults/linuxrc:
 +  Add /run to support openrc >=0.10
 +
    11 Jun 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
    Bump version to 3.4.36