[Kimchi-devel] [wok 2/2] Fix merge of patch 02