Merge remote branch 'origin/btdun'

diff --cc include/NetworkManager.h
Simple merge

diff --cc marshallers/nm-marshal.list
Simple merge

diff --cc src/Makefile.am
index db255ca,171ce11..a150500
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -152,9 -152,12 +156,15 @@@ nm-active-connection-glue.h: $(top_srcd
  nm-dhcp4-config-glue.h: $(top_srcdir)/introspection/nm-dhcp4-config.xml
        dbus-binding-tool --prefix=nm_dhcp4_config --mode=glib-server --output=$@ $<
  
 +nm-dhcp6-config-glue.h: $(top_srcdir)/introspection/nm-dhcp6-config.xml
 +      dbus-binding-tool --prefix=nm_dhcp6_config --mode=glib-server --output=$@ $<
 +
+ nm-device-cdma-glue.h: $(top_srcdir)/introspection/nm-device-cdma.xml
+       dbus-binding-tool --prefix=nm_device_cdma --mode=glib-server --output=$@ $<
+ 
+ nm-device-gsm-glue.h: $(top_srcdir)/introspection/nm-device-gsm.xml
+       dbus-binding-tool --prefix=nm_device_gsm --mode=glib-server --output=$@ $<
+ 
  BUILT_SOURCES = \
        nm-access-point-glue.h \
        nm-manager-glue.h \