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