Merge remote branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 24 Jan 2011 21:16:56 +0000 (15:16 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 24 Jan 2011 21:16:56 +0000 (15:16 -0600)
commit24c842291802125446931dc312bb882bd7d98620
tree2a6ddbcee95ca474bb0228ea8d7bece6524eecd0
parentda49c5502f614441c30fecaf11ec3283a96f6625
parent8946219def939517734b027223a9e678ff4a658c
Merge remote branch 'kwolf/for-anthony' into staging