diff -u network-manager-applet-0.8.4~git.20110318t152954.9c4c9a0/debian/changelog network-manager-applet-0.8.4~git.20110318t152954.9c4c9a0/debian/changelog
--- network-manager-applet-0.8.4~git.20110318t152954.9c4c9a0/debian/changelog
+++ network-manager-applet-0.8.4~git.20110318t152954.9c4c9a0/debian/changelog
@@ -1,3 +1,12 @@
+network-manager-applet (0.8.4~git.20110318t152954.9c4c9a0-0ubuntu2~ppa1) natty; urgency=low
+
+  * debian/patches/clear-notification-actions.patch: clear actions tied to
+    notifications being sent; otherwise stacking notifications also causes the
+    attached actions to be stacked (resulting in multiple "Don't show this"
+    buttons appearing in the notification bubble. (LP: #606825) 
+
+ -- David Fraser <davidf@sjsoft.com>  Fri, 16 Sep 2011 06:46:14 +0200
+
 network-manager-applet (0.8.4~git.20110318t152954.9c4c9a0-0ubuntu1) natty; urgency=low
 
   * upstream snapshot 2011-03-18 15:29:54 (GMT)
diff -u network-manager-applet-0.8.4~git.20110318t152954.9c4c9a0/debian/patches/series network-manager-applet-0.8.4~git.20110318t152954.9c4c9a0/debian/patches/series
--- network-manager-applet-0.8.4~git.20110318t152954.9c4c9a0/debian/patches/series
+++ network-manager-applet-0.8.4~git.20110318t152954.9c4c9a0/debian/patches/series
@@ -14,2 +14,3 @@
 applet-wifi-menu-before-vpn.patch
+clear-notification-actions.patch
 nm-applet-use-indicator.patch
only in patch2:
unchanged:
--- network-manager-applet-0.8.4~git.20110318t152954.9c4c9a0.orig/debian/patches/clear-notification-actions.patch
+++ network-manager-applet-0.8.4~git.20110318t152954.9c4c9a0/debian/patches/clear-notification-actions.patch
@@ -0,0 +1,21 @@
+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
+Subject: applet: clear notification actions before adding new ones
+Bug-Ubuntu: http://bugs.launchpad.net/bugs/606825 
+
+Make sure we only ever have one of the "Don't show this again" button that
+will trigger disabling notifications. Otherwise we end up with multiple
+instances of the same button in notifications because one gets added every
+time a new notification stacks on top of an existing one.
+
+Index: network-manager-applet-0.9.0/src/applet.c
+===================================================================
+--- network-manager-applet-0.9.0.orig/src/applet.c	2011-09-13 10:23:03.908270535 -0400
++++ network-manager-applet-0.9.0/src/applet.c	2011-09-13 10:24:05.778270651 -0400
+@@ -871,6 +871,7 @@
+ 	notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
+ 
+ 	if (applet->notify_actions && action1) {
++		notify_notification_clear_actions (notify);
+ 		notify_notification_add_action (notify, action1, action1_label,
+ 		                                action1_cb, action1_user_data, NULL);
+ 	}