tree 1a9b3c6e3c0adee80c7ddc8e86dcf746574fb37b
parent b3235fe420edf7faf5e8e67b978b12d5524fb161
parent 42368c37fbd51f7b478d041ae55c5df000897158
author Michal Marek <mmarek@suse.cz> 1288220065 +0200
committer Michal Marek <mmarek@suse.cz> 1288220065 +0200

Merge branch 'message-callback' into kbuild/kconfig

Conflicts:
	scripts/kconfig/nconf.c