balabala
Merge branch 'master' of github.com:dashulu/xen

Conflicts:
	ext2-util.c