diff -r cdb4ed8660c5 -r 574631f841c3 lib/my_db.py
--- a/lib/my_db.py	Wed Sep 24 17:51:18 2003 -0400
+++ b/lib/my_db.py	Thu Sep 25 11:02:05 2003 -0400
@@ -52,7 +52,7 @@
 			SET url = %s, name = %s,
 			ldesc = %s, added = %s
 			WHERE id = %d;
-			""" % (bk.url, sql_quote(bk.name),
+			""" % (sql_quote(bk.url), sql_quote(bk.name),
 			sql_quote(bk.desc),
 			sql_quote(bk.added), bk.id))
 		self.cnx.commit()
@@ -87,7 +87,7 @@
 	def get_keyword(self, id):
 		self.crs.execute("""
 			SELECT name FROM keywords
-			WHERE keyword.id = %d;
+			WHERE id = %d;
 			""" % (id,))
 		return self.crs.fetchone()[0]
 	def get_keywords(self, bk_id):
@@ -119,8 +119,12 @@
 		self.crs.execute("""
 			UPDATE bookmarks_keywords
 			SET keyword = %d
-			WHERE keyword = %d;
-			""" % (into_id, merge_id))
+			WHERE keyword = %d
+			AND NOT ( bookmark IN 
+			  (SELECT bookmark FROM bookmarks_keywords
+			  WHERE keyword = %d ))
+			;
+			""" % (into_id, merge_id, merge_id))
 		self.remove_keyword(merge_id)
 	def get_all_keywords(self):
 		"""Return a list of triplets [id, keyword, count]."""