Merge remote-tracking branch 'origin/master' into staging
commit1571b6cba25df6d000b2539b8ba399839d15f9b6
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 21 Nov 2011 20:36:55 +0000 (21 14:36 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 21 Nov 2011 20:36:55 +0000 (21 14:36 -0600)
treea9b92e81d01e08e76477127d1e3dae07eaeca212
parent54dcd0b37e3e4e9fb25cb4e9965d6ba45eb0d2b4
parentbc4268998d154b9b3cc86a7b6bd932cc974591c9
Merge remote-tracking branch 'origin/master' into staging