Merge remote branch 'origin/master' into staging
commitc84995c50b850ab4febc9f21c58a18ee712e7bed
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 15 Jul 2010 13:19:53 +0000 (15 08:19 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 15 Jul 2010 13:19:53 +0000 (15 08:19 -0500)
treeeeef1d2c3501fac184723fc5ac0f08f8fc5cf142
parentc7ba56c4f0f50845068b037430f947e27e92011a
parentfed61bbe3235f0a3507bfb688354bc0431743133
Merge remote branch 'origin/master' into staging