From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 12 Mar 2014 12:47:26 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kiszka/queues/slirp' into staging
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2c3445bb850fbfb4481e9487d8852f10e8c74e4c;p=qmiga%2Fqemu.git

Merge remote-tracking branch 'remotes/kiszka/queues/slirp' into staging

* remotes/kiszka/queues/slirp:
  slirp smb with modern win guests when samba is also running on host
  qemu/slirp: Fix SMB security configuration on newer samba versions

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

2c3445bb850fbfb4481e9487d8852f10e8c74e4c