Merge remote branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 10 Jun 2010 14:21:43 +0000 (09:21 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 10 Jun 2010 14:21:43 +0000 (09:21 -0500)
1  2 
net.c

diff --cc net.c
Simple merge