review.tizen.org Git - sdk/emulator/qemu.git/commit

author	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 31 Oct 2011 16:09:00 +0000 (11:09 -0500)
committer	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 31 Oct 2011 16:09:00 +0000 (11:09 -0500)
commit	3e40a801636ef437c807c81956100d09f3b9f338
tree	2c3ff12f56cb2587d00bab448a226d3cf0042d64	tree \| snapshot
parent	206709ba12b6b38a1717ad3098cb74d9ec76e02e	commit \| diff
parent	b79886270ab4916998baa34b6fc6974fd5ac9d0f	commit \| diff

Merge remote-tracking branch 'kwolf/for-anthony' into staging

Conflicts:
block/vmdk.c

Domain: SDK / Emulator;