Merge remote-tracking branch 'origin/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 14:25:36 +0000 (09:25 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 14:25:36 +0000 (09:25 -0500)
commit6c0eb26678d53bc2f3883d7168916fbaabfee08c
treefac5cdbd4cdf43bf5009dd46bf3e8659f9d2feb4
parentb5966760d055264a9312fea33f2a1ba1ecc09776
parent29d14795f657dc4ba217480ef48f9294d1ffc4bf
Merge remote-tracking branch 'origin/master' into staging