Merge branch 'dbus-1.10'

diff --cc tools/dbus-send.c
index c2884c1,235e58e..6fb65fe
--- 1/tools/dbus-send.c
--- 2/tools/dbus-send.c
+++ b/tools/dbus-send.c
@@@ -484,7 -463,8 +484,8 @@@ main (int argc, char *argv[]
        DBusMessageIter *target_iter;
        DBusMessageIter container_iter;
  
 -      type = DBUS_TYPE_INVALID;
 +      type2 = DBUS_TYPE_INVALID;
+       secondary_type = DBUS_TYPE_INVALID;
        arg = argv[i++];
        c = strchr (arg, ':');
  
@@@ -565,10 -545,11 +566,11 @@@
        }
        else if (container_type == DBUS_TYPE_DICT_ENTRY)
        {
 -        append_dict (target_iter, type, secondary_type, c);
+         _dbus_assert (secondary_type != DBUS_TYPE_INVALID);
 +        append_dict (target_iter, type2, secondary_type, c);
        }
        else
 -      append_arg (target_iter, type, c);
 +      append_arg (target_iter, type2, c);
  
        if (container_type != DBUS_TYPE_INVALID)
        {