tree 5274ff496f2665487736a4eec23bf76601e4da44
parent 8d4c78e7c8adf0a4440a8de92738b3820fc8215a
parent d2d979c628e4b2c4a3cb71a31841875795c79043
author Michael S. Tsirkin <mst@redhat.com> 1304602787 +0300
committer Michael S. Tsirkin <mst@redhat.com> 1304602787 +0300

Merge remote branch 'origin/master' into pci

Conflicts:
	exec.c