diff -u nss-3.12.9+ckbi-1.82/debian/changelog nss-3.12.9+ckbi-1.82/debian/changelog
--- nss-3.12.9+ckbi-1.82/debian/changelog
+++ nss-3.12.9+ckbi-1.82/debian/changelog
@@ -1,3 +1,16 @@
+nss (3.12.9+ckbi-1.82-0ubuntu2multiarch.1) natty; urgency=low
+
+  * Merge from natty.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 22 Apr 2011 11:00:14 -0700
+
+nss (3.12.9+ckbi-1.82-0ubuntu2) natty; urgency=low
+
+  * add explicit conflict to sunbird for systems that have this
+    package leftover from karmic days (LP: #760713)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 20 Apr 2011 13:45:50 +0200
+
 nss (3.12.9+ckbi-1.82-0ubuntu1+multiarch.2) natty; urgency=low
 
   * No-change rebuild to pick up a build for armel
diff -u nss-3.12.9+ckbi-1.82/debian/control nss-3.12.9+ckbi-1.82/debian/control
--- nss-3.12.9+ckbi-1.82/debian/control
+++ nss-3.12.9+ckbi-1.82/debian/control
@@ -12,7 +12,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: libnss3-1d
-Conflicts: libnss3-1d (<< 3.12.9~b2)
+Conflicts: libnss3-1d (<< 3.12.9~b2), sunbird
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Network Security Service libraries