Merge commit 'refs/pull/436/head' of https://github.com/systemd/systemd

This merges:
  sd-netlink: respect attribute type flags

..fixing a conflict due to a typo fix.

diff --cc src/libsystemd/sd-netlink/netlink-internal.h
index 6f51ebe73db0f6bd565f0de13fcfe741016dd14f,4aa7583d0319e8b31c904d55aa47de87c8a5b21e..4026e2c341b1333fe3e648e0e30ee6186a8372e0
--- 1/src/libsystemd/sd-netlink/netlink-internal.h
--- 2/src/libsystemd/sd-netlink/netlink-internal.h
+++ b/src/libsystemd/sd-netlink/netlink-internal.h
@@@ -93,7 -93,9 +93,9 @@@ struct sd_netlink 
  };
  
  struct netlink_attribute {
 -        size_t offset; /* offset from hdr to attirubte */
 +        size_t offset; /* offset from hdr to attribute */
+         bool nested:1;
+         bool net_byteorder:1;
  };
  
  struct netlink_container {