Merge branch 'kbuild/kconfig-for-40' into kbuild/kconfig
Michal Marek [Wed, 25 May 2011 13:33:20 +0000 (15:33 +0200)]

Trivial merge