Merge remote-tracking branch 'kwolf/for-anthony' into staging
commit2963e65a4e195737256d849166981ea24a337b2e
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 7 Nov 2011 16:57:27 +0000 (7 10:57 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 7 Nov 2011 16:57:27 +0000 (7 10:57 -0600)
tree9de12b20f50f9d8226c6399ee42b71267bf2a9a6
parentca062aaed0b88060914ffb58442e12fde08db26d
parent273e4e03b3413fd489601cd9d8ba407ccb3b4130
Merge remote-tracking branch 'kwolf/for-anthony' into staging