Merge remote-tracking branch 'mst-tmp/for_anthony' into staging
commit03c39eb558472ab3b13a39e9159b2e1ffa6c3a43
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 20 Sep 2011 20:22:10 +0000 (20 15:22 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 20 Sep 2011 20:22:10 +0000 (20 15:22 -0500)
treef19079357c2c346d0b00a94d7ac8d85185fbdbff
parentc8af89af96dac46922f6664cf0ca238a6b1adf0d
parent336411cafd385be1fc3de4472595d409ac7fe2b2
Merge remote-tracking branch 'mst-tmp/for_anthony' into staging