Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 22 Sep 2011 15:31:26 +0000 (10:31 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 22 Sep 2011 15:31:26 +0000 (10:31 -0500)
commit751ac4e4fea441c75cbba9749df334a467acd634
tree880f123713fa1904f82accab4bbebf673307c915
parent0e62085a7a8cc63cc0f16451c52f4aaf3032562a
parent6eeb266754d624671e509048d84f88b036bfbee7
Merge remote-tracking branch 'kwolf/for-anthony' into staging