Merge branch 'dbus-1.2'

Conflicts:
	dbus/dbus-sysdeps-unix.c

diff --cc dbus/dbus-sysdeps-unix.c
index e859ec601c076db58f7c24ba7322af3b9a769103,b58d09ab8350b53e3c8e96a7584c902082b30c2a..e4ff6eea7eda466e9d83c0a622b5dc657b72b729
--- 1/dbus/dbus-sysdeps-unix.c
--- 2/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@@ -1322,11 -925,18 +1332,19 @@@ _dbus_listen_tcp_socket (const cha
          }
        _DBUS_ASSERT_ERROR_IS_CLEAR(error);
  
+       reuseaddr = 1;
+       if (setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr))==-1)
+         {
+           dbus_set_error (error, _dbus_error_from_errno (errno),
+                           "Failed to set socket option \"%s:%s\": %s",
+                           host ? host : "*", port, _dbus_strerror (errno));
+         }
+ 
        if (bind (fd, (struct sockaddr*) tmp->ai_addr, tmp->ai_addrlen) < 0)
          {
 +          saved_errno = errno;
            _dbus_close(fd, NULL);
 -          if (errno == EADDRINUSE)
 +          if (saved_errno == EADDRINUSE)
              {
                /* Depending on kernel policy, it may or may not
                   be neccessary to bind to both IPv4 & 6 addresses