diff --git a/ChangeLog b/ChangeLog
index 8801cf928..5edd4b1d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-24 19:45-EST Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Source/NSPopUpButtonCell.m: remove _popUpItemAction: from
+	-insertItemWithTitle:atIndex:.
+
 2013-01-19  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/AppKit/NSTextContainer.h,
@@ -9,6 +14,7 @@
 	* Header/AppKit/NSLayoutManager.h,
 	* Source/NSLayoutManager.m: Add one 10.5 method.
 
+>>>>>>> .r36016
 2013-01-13  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* configure.ac:
diff --git a/Source/NSPopUpButtonCell.m b/Source/NSPopUpButtonCell.m
index 9a0ac4626..23bd91d46 100644
--- a/Source/NSPopUpButtonCell.m
+++ b/Source/NSPopUpButtonCell.m
@@ -426,9 +426,9 @@ static NSImage *_pbc_image[5];
   //[anItem setAction: [self action]];
   //[anItem setTarget: [self target]];
   // Or
-  [anItem setAction: @selector(_popUpItemAction:)];
-  [anItem setTarget: self];
-
+  //[anItem setAction: @selector(_popUpItemAction:)];
+  //[anItem setTarget: self];
+  
   // Select the new item if there isn't any selection.
   if (_selectedItem == nil)
     {