tree 6383b008e7be6cefaab9dfeaa1ba7374b322f169
parent 15a0f3bf77cf60ae29484f0c0a26c679e4c688fd
parent 276eda5735824dd6cf66e1f0951aa8af97354540
author Anthony Liguori <aliguori@us.ibm.com> 1335916081 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1335916081 -0500

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

* kiszka/queues/slirp:
  Declare state directory in smb.conf
  slirp: don't use "smb ports = 0" option