Merge branch 'master' of git://github.com/jedi4ever/veewee into kvm-windows

Conflicts:
	doc/kvm.md