Merge remote branch 'origin/master' into staging
commit43d5438997c49896879f5522b0dfa98f0052888d
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 23 Apr 2010 18:48:33 +0000 (23 13:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 23 Apr 2010 18:48:33 +0000 (23 13:48 -0500)
treecc56f8f2d570391288babdb2daf3f6a14dfae82a
parent1e1ea48d42e011b9bdd0d689d184e7cac4617b66
parent41db525e9c6e4c98d6e41c403c7dc704ce0e77aa
Merge remote branch 'origin/master' into staging