From: Ian Jackson <iwj@woking.cam.xci-test.com>
Date: Thu, 12 Sep 2013 14:37:19 +0000 (+0100)
Subject: Merge branch 'pretest' of /export/home/osstest/testing.git/ into wip
X-Git-Tag: wip.xsm-13-actual.base~458
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=87469458381304213da26a1a26d9bcfab2252567;p=people%2Fiwj%2Fosstest.git

Merge branch 'pretest' of /export/home/osstest/testing.git/ into wip
---

87469458381304213da26a1a26d9bcfab2252567