]> xenbits.xensource.com Git - qemu-xen-3.3-testing.git/commitdiff
Merge branch 'master' of ../qemu-iwj
authorIan Jackson <iwj@mariner.uk.xensource.com>
Tue, 15 Jul 2008 17:47:44 +0000 (18:47 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 15 Jul 2008 17:47:44 +0000 (18:47 +0100)

Trivial merge