From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 18 Jun 2013 15:06:39 +0000 (-0500)
Subject: Merge remote-tracking branch 'bonzini/nbd-next' into staging
X-Git-Tag: v1.6.0-rc0~196
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7d8f4b34a4bb6996d958da211f1dfb2686c7d82b;p=qemu-xen-unstable.git

Merge remote-tracking branch 'bonzini/nbd-next' into staging

# By Ján Tomko
# Via Paolo Bonzini
* bonzini/nbd-next:
  nbd: strip braces from literal IPv6 address in URI
  qemu-socket: allow hostnames starting with a digit
---

7d8f4b34a4bb6996d958da211f1dfb2686c7d82b