Merge remote branch 'kwolf/for-anthony' into staging
commit09fa35e5cdc7d17ed3e1528ca743893ae77a0ea2
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 30 Nov 2010 21:25:34 +0000 (30 15:25 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 30 Nov 2010 21:25:34 +0000 (30 15:25 -0600)
treeb11bb495700b297a4d49692bfd8d6070a1b74e0b
parent9233da785f55c924c5850cd1ce1b7f5f200d631b
parentb76876e602ca09ff848d99595a506feb1fd54ff4
Merge remote branch 'kwolf/for-anthony' into staging