Merge branch 'setlocalversion-speedup' into kbuild/rc-fixes
Michal Marek [Fri, 2 Jul 2010 09:56:52 +0000 (11:56 +0200)]
Conflicts:
Makefile

1  2 
Makefile

diff --cc Makefile
Simple merge