tree 6801ad2929c48f84466abc99aed8502a36f89db7
parent 5a4b99cd3b5a2d35323222d35b004b2c67735f96
parent 6e4c0d1f03d6ab407509c32fab7cb4b8230f57ff
author Nicholas Bellinger <nab@linux-iscsi.org> 1346962190 -0700
committer Nicholas Bellinger <nab@linux-iscsi.org> 1346962190 -0700

Merge branch 'master' of git://git.qemu.org/qemu