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