Merge remote-tracking branch 'kiszka/queues/slirp' into staging
commit006c891fc9d4f044ad3f41b6e019442523b45a54
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 16 Feb 2012 00:40:26 +0000 (15 18:40 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 16 Feb 2012 00:40:26 +0000 (15 18:40 -0600)
tree5126f84a0eb0411daf55951ec45656a3b242404d
parent7718564ba1295f35188a5fb3ac8633c29d43b166
parent6612db12d56c68fff3e56ca4ea8c41d9d55c12e4
Merge remote-tracking branch 'kiszka/queues/slirp' into staging

* kiszka/queues/slirp:
  slirp: Prevent sending ICMP error replies to source-only addresses
  slirp: Remove unused variable and unused code