diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 9ae708c13..163f9a90d 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,6 +1,11 @@
+2006-09-02  Don Allingham  <don@gramps-project.org>
+	* src/DisplayTabs/_EventEmbedList.py: Don't override event type on
+	a drag-n-drop (bug #420)
+	* po/POTFILES.in: remove non-shipping modules
+
 2006-09-01  Brian Matherly  <brian@gramps-project.org>
-    * src/plugins/Calendar.py: fix filter typo
-    * src/plugins/WritePkg.py: don't set uid on Windows
+        * src/plugins/Calendar.py: fix filter typo
+        * src/plugins/WritePkg.py: don't set uid on Windows
 
 2006-09-01  Alex Roitman  <shura@gramps-project.org>
 	* src/GrampsDb/_DbUtils.py: Use normal addition: this updates
diff --git a/gramps2/po/POTFILES.in b/gramps2/po/POTFILES.in
index eb601709d..d48e24021 100644
--- a/gramps2/po/POTFILES.in
+++ b/gramps2/po/POTFILES.in
@@ -216,45 +216,45 @@ src/Mime/__init__.py
 src/Mime/_PythonMime.py
 
 # Models package
-src/Models/_FastFilterModel.py
-src/Models/_FastModel.py
-src/Models/__init__.py
-src/Models/_ListCursor.py
-src/Models/_PathCursor.py
-src/Models/_PersonFilterModel.py
-src/Models/_PersonListModel.py
-src/Models/_PersonTreeModel.py
+# src/Models/_FastFilterModel.py
+# src/Models/_FastModel.py
+# src/Models/__init__.py
+# src/Models/_ListCursor.py
+# src/Models/_PathCursor.py
+# src/Models/_PersonFilterModel.py
+# src/Models/_PersonListModel.py
+# src/Models/_PersonTreeModel.py
 
 # ObjectSelector package
-src/ObjectSelector/_Constants.py
-src/ObjectSelector/_Factories.py
-src/ObjectSelector/_FamilyFilterFrame.py
-src/ObjectSelector/_FamilyFrame.py
-src/ObjectSelector/_FamilyPreviewFrame.py
-src/ObjectSelector/_FamilyTreeFrame.py
-src/ObjectSelector/_FilterFrameBase.py
-src/ObjectSelector/_FilterSpecBase.py
-src/ObjectSelector/__init__.py
-src/ObjectSelector/_ObjectFrameBase.py
-src/ObjectSelector/_ObjectSelectorWindow.py
-src/ObjectSelector/_PersonFilterFrame.py
-src/ObjectSelector/_PersonFilterSpec.py
-src/ObjectSelector/_PersonFrame.py
-src/ObjectSelector/_PersonPreviewFrame.py
-src/ObjectSelector/_PersonTreeFrame.py
-src/ObjectSelector/_PreviewFrameBase.py
-src/ObjectSelector/_TreeFrameBase.py
-src/Selectors/_BaseSelector.py
-src/Selectors/_SelectEvent.py
-src/Selectors/_SelectFamily.py
-src/Selectors/_SelectObject.py
-src/Selectors/_SelectPerson.py
-src/Selectors/_SelectPlace.py
-src/Selectors/_SelectRepository.py
-src/Selectors/_SelectSource.py
-src/Selectors/_SelectorExceptions.py
-src/Selectors/_SelectorFactory.py
-src/Selectors/__init__.py
+# src/ObjectSelector/_Constants.py
+# src/ObjectSelector/_Factories.py
+# src/ObjectSelector/_FamilyFilterFrame.py
+# src/ObjectSelector/_FamilyFrame.py
+# src/ObjectSelector/_FamilyPreviewFrame.py
+# src/ObjectSelector/_FamilyTreeFrame.py
+# src/ObjectSelector/_FilterFrameBase.py
+# src/ObjectSelector/_FilterSpecBase.py
+# src/ObjectSelector/__init__.py
+# src/ObjectSelector/_ObjectFrameBase.py
+# src/ObjectSelector/_ObjectSelectorWindow.py
+# src/ObjectSelector/_PersonFilterFrame.py
+# src/ObjectSelector/_PersonFilterSpec.py
+# src/ObjectSelector/_PersonFrame.py
+# src/ObjectSelector/_PersonPreviewFrame.py
+# src/ObjectSelector/_PersonTreeFrame.py
+# src/ObjectSelector/_PreviewFrameBase.py
+# src/ObjectSelector/_TreeFrameBase.py
+# src/Selectors/_BaseSelector.py
+# src/Selectors/_SelectEvent.py
+# src/Selectors/_SelectFamily.py
+# src/Selectors/_SelectObject.py
+# src/Selectors/_SelectPerson.py
+# src/Selectors/_SelectPlace.py
+# src/Selectors/_SelectRepository.py
+# src/Selectors/_SelectSource.py
+# src/Selectors/_SelectorExceptions.py
+# src/Selectors/_SelectorFactory.py
+# src/Selectors/__init__.py
 
 # plugins directory
 src/plugins/AncestorChart2.py
@@ -393,8 +393,8 @@ src/RelLib/_EventRoleType.py
 src/RelLib/_EventType.py
 
 # TreeViews package
-src/TreeViews/__init__.py
-src/TreeViews/_PersonTreeView.py
+# src/TreeViews/__init__.py
+# src/TreeViews/_PersonTreeView.py
 
 # Filters package
 src/Filters/_FilterComboBox.py
diff --git a/gramps2/src/DisplayTabs/_EventEmbedList.py b/gramps2/src/DisplayTabs/_EventEmbedList.py
index 1034f3c47..a8dfffee4 100644
--- a/gramps2/src/DisplayTabs/_EventEmbedList.py
+++ b/gramps2/src/DisplayTabs/_EventEmbedList.py
@@ -87,7 +87,6 @@ class EventEmbedList(EmbeddedList):
         try:
             ref = RelLib.EventRef()
             event = self.dbstate.db.get_event_from_handle(obj)
-            event.set_type(self.default_type())
             ref.set_role(self.default_role())
             self.get_ref_editor()(
                 self.dbstate, self.uistate, self.track,