diff --git a/ChangeLog b/ChangeLog
index 07c7c53ed4..d480694ef9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-03  Derek Atkins  <derek@ihtfp.com>
+
+	* src/engine/Split.c:
+	  Properly round values when setting the Base Value.  Fixes #337505.
+	* src/business/dialog-tax-table/tax-tables.glade:
+	  fix a string.  It should be "Edit" not "gtk-edit".  This string
+	  is already translated, so shouldn't be an issue for the string
+	  freeze.
+
 2006-06-03  Joshua Sled  <jsled@asynchronous.org>
 
 	* src/gnome/ui/gnc-plugin-page-register-ui.xml:
@@ -21,6 +30,7 @@
 	register to change the notebook page, just like from the accounts
 	page. Also remove some dead code.
 
+>>>>>>> .r14316
 2006-06-03  Andreas Köhler  <andi5.py@gmx.net>
 
 	* src/gnome-utils/Makefile.am:
diff --git a/src/business/dialog-tax-table/tax-tables.glade b/src/business/dialog-tax-table/tax-tables.glade
index 5bf05143aa..7514b5cfb4 100644
--- a/src/business/dialog-tax-table/tax-tables.glade
+++ b/src/business/dialog-tax-table/tax-tables.glade
@@ -308,7 +308,7 @@
 			<widget class="GtkButton" id="edit_entry_button">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label">gtk-edit</property>
+			  <property name="label">Edit</property>
 			  <property name="use_stock">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
diff --git a/src/engine/Split.c b/src/engine/Split.c
index ef88c0d03d..7e620383e8 100644
--- a/src/engine/Split.c
+++ b/src/engine/Split.c
@@ -925,15 +925,15 @@ xaccSplitSetBaseValue (Split *s, gnc_numeric value,
     if (gnc_commodity_equiv(commodity, base_currency)) {
       s->amount = gnc_numeric_convert(value,
                                       get_commodity_denom(s), 
-                                      GNC_HOW_RND_NEVER);
+                                      GNC_HOW_RND_ROUND);
     }
     s->value = gnc_numeric_convert(value, 
                                    get_currency_denom(s),
-                                   GNC_HOW_RND_NEVER);
+                                   GNC_HOW_RND_ROUND);
   }
   else if (gnc_commodity_equiv(commodity, base_currency)) {
     s->amount = gnc_numeric_convert(value, get_commodity_denom(s),
-                                    GNC_HOW_RND_NEVER);
+                                    GNC_HOW_RND_ROUND);
   }
   else {
     PERR ("inappropriate base currency %s "