diff -Nru network-manager-0.7.1~rc1+20090220/debian/changelog network-manager-0.7.1~rc1+20090220/debian/changelog
--- network-manager-0.7.1~rc1+20090220/debian/changelog	2009-03-01 21:39:33.000000000 +0000
+++ network-manager-0.7.1~rc1+20090220/debian/changelog	2009-03-01 21:39:33.000000000 +0000
@@ -1,3 +1,12 @@
+network-manager (0.7.1~rc1+20090220-0ubuntu2) UNRELEASED; urgency=low
+
+  * src/nm-hal-manager.c: ignore virtual 'wired' devices whose originating
+    device is /org/freedesktop/Hal/devices/computer, since these are generally
+    managed by some other daemon and network-manager just gets in the
+    way.  LP: #199140.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 01 Mar 2009 00:19:41 -0800
+
 network-manager (0.7.1~rc1+20090220-0ubuntu1) jaunty; urgency=low
 
   * upstream 0.7.1 rc1 (post) snapshot
diff -Nru network-manager-0.7.1~rc1+20090220/debian/patches/60_NULL_info_linux_driver.patch network-manager-0.7.1~rc1+20090220/debian/patches/60_NULL_info_linux_driver.patch
--- network-manager-0.7.1~rc1+20090220/debian/patches/60_NULL_info_linux_driver.patch	2009-03-01 21:39:33.000000000 +0000
+++ network-manager-0.7.1~rc1+20090220/debian/patches/60_NULL_info_linux_driver.patch	2009-03-01 21:39:33.000000000 +0000
@@ -3,16 +3,11 @@
  src/nm-hal-manager.c |    4 ++++
  1 file changed, 4 insertions(+)
 
-Index: network-manager-0.7.1~rc1/src/nm-hal-manager.c
+Index: network-manager-0.7.1~rc1+20090220/src/nm-hal-manager.c
 ===================================================================
---- network-manager-0.7.1~rc1.orig/src/nm-hal-manager.c
-+++ network-manager-0.7.1~rc1/src/nm-hal-manager.c
-@@ -122,16 +122,20 @@
- {
- 	char *driver_name = NULL;
- 
- 	if (origdev_udi && libhal_device_property_exists (ctx, origdev_udi, "info.linux.driver", NULL)) {
- 		char *drv = libhal_device_get_property_string (ctx, origdev_udi, "info.linux.driver", NULL);
+--- network-manager-0.7.1~rc1+20090220.orig/src/nm-hal-manager.c
++++ network-manager-0.7.1~rc1+20090220/src/nm-hal-manager.c
+@@ -127,6 +127,10 @@
  		driver_name = g_strdup (drv);
  		libhal_free_string (drv);
  	}
@@ -23,8 +18,3 @@
  	return driver_name;
  }
  
- /* Wired device creator */
- 
- static gboolean
- is_wired_device (NMHalManager *self, const char *udi)
- {
diff -Nru network-manager-0.7.1~rc1+20090220/debian/patches/lp199140_dont_manage_virtual_devices.patch network-manager-0.7.1~rc1+20090220/debian/patches/lp199140_dont_manage_virtual_devices.patch
--- network-manager-0.7.1~rc1+20090220/debian/patches/lp199140_dont_manage_virtual_devices.patch	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-0.7.1~rc1+20090220/debian/patches/lp199140_dont_manage_virtual_devices.patch	2009-03-01 21:39:33.000000000 +0000
@@ -0,0 +1,28 @@
+Index: network-manager-0.7.1~rc1+20090220/src/nm-hal-manager.c
+===================================================================
+--- network-manager-0.7.1~rc1+20090220.orig/src/nm-hal-manager.c
++++ network-manager-0.7.1~rc1+20090220/src/nm-hal-manager.c
+@@ -140,7 +140,7 @@
+ is_wired_device (NMHalManager *self, const char *udi)
+ {
+ 	NMHalManagerPrivate *priv = NM_HAL_MANAGER_GET_PRIVATE (self);
+-	char *category;
++	char *category, *netdev_parent;
+ 	gboolean is_wired = FALSE;
+ 
+ 	if (libhal_device_property_exists (priv->hal_ctx, udi, "net.linux.ifindex", NULL) &&
+@@ -153,6 +153,14 @@
+ 		}
+ 	}
+ 
++	if (libhal_device_property_exists (priv->hal_ctx, udi, "net.originating_device", NULL))
++	{
++		netdev_parent = libhal_device_get_property_string (priv->hal_ctx, udi, "net.originating_device", NULL);
++		if (!strcmp(netdev_parent, "/org/freedesktop/Hal/devices/computer"))
++			is_wired = FALSE;
++		libhal_free_string (netdev_parent);
++	}
++
+ 	return is_wired;
+ }
+ 
diff -Nru network-manager-0.7.1~rc1+20090220/debian/patches/series network-manager-0.7.1~rc1+20090220/debian/patches/series
--- network-manager-0.7.1~rc1+20090220/debian/patches/series	2009-03-01 21:39:33.000000000 +0000
+++ network-manager-0.7.1~rc1+20090220/debian/patches/series	2009-03-01 21:39:33.000000000 +0000
@@ -9,5 +9,6 @@
 lp291902_IFUPDOWN_dont_export_connection_in_unmanaged_mode.patch
 lp303142_more_time_for_manual_registration.patch
 lp120363_smartcard_pkcs11.patch
+lp199140_dont_manage_virtual_devices.patch
 
 # debian patches