Merge branch 'bug-351906'

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 8e1bc2fc031ffa5f29ea0ce99a4a86b00d3ec1b7,686fcc38fc77a1f4e4884f2baac1f4061d243425..cce54ee344e05703ba168b65ed5aa216513b6cac
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -5,10 -5,10 +5,14 @@@
  # Distributed under the GPL v2
  # $Id$
  
+   20 Jan 2011; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh:
+   Move application of kernel config after "make mrproper" as that deletes
+   .config (whereas "make clean" does not) (bug #351906)
+ 
 +  20 Jan 2011; Sebastian Pipping <sping@gentoo.org>
 +  patches/busybox/1.18.1/1.18.1-mdstart.diff:
 +  busybox 1.18.1: Return of mdstart as an applet (regression) (bug #351909)
 +
    16 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
    Bump version to 3.4.11