Merge commit 'v3.0-rc1' into kbuild/kconfig
Michal Marek [Wed, 8 Jun 2011 14:01:34 +0000 (16:01 +0200)]

Trivial merge