initial merge of vkernel 1.2 sources