Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 7 Nov 2011 16:57:27 +0000 (10:57 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 7 Nov 2011 16:57:27 +0000 (10:57 -0600)
commit9e5a8d6f7a5629487d4b3d14f9839f7676b961a7
tree9de12b20f50f9d8226c6399ee42b71267bf2a9a6
parent57aff498a66b9a75db3146e95b6ad065b651e6a4
parentec8ef1a4fa381cb6bcc5860019ddca1d2d4af654
Merge remote-tracking branch 'kwolf/for-anthony' into staging