tree 0374e4d581a0246074d55712b81baf01f3c439b6
parent 62e0c095450f6a7eb37914991f3f7966aa4da7a1
parent 36f25d2537c40c6c47f4abee5d31a24863d1adf7
author Andreas Färber <afaerber@suse.de> 1356219574 +0100
committer Andreas Färber <afaerber@suse.de> 1356219649 +0100

Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu

Adapt header include paths.

Signed-off-by: Andreas Färber <afaerber@suse.de>