fix merge bug, this should fix this issue for now, but might need further work later.

source/blender/blenlib/intern/edgehash.c

@@ -22,7 +22,7 @@
  *
  * The Original Code is: none of this file.
  *
- * Contributor(s): Daniel Dunbar
+ * Contributor(s): Daniel Dunbar, Joseph Eagar
  *
  * ***** END GPL LICENSE BLOCK *****
  * A general (pointer -> pointer) hash table ADT

source/blender/bmesh/bmesh_marking.h

@@ -39,5 +39,6 @@ void BM_editselection_plane(BMesh *bm, float *plane, BMEditSelection *ese);
 void BM_remove_selection(BMesh *bm, void *data);
 void BM_store_selection(BMesh *bm, void *data);
 void BM_validate_selections(BMesh *bm);
+void BM_clear_selection_history(BMesh *em);
 
 #endif

source/blender/bmesh/intern/bmesh_marking.c

@@ -502,6 +502,12 @@ void BM_remove_selection(BMesh *em, void *data)
 	}
 }
 
+void BM_clear_selection_history(BMesh *em)
+{
+	BLI_freelistN(&em->selected);
+	em->selected.first = em->selected.last = NULL;
+}
+
 void BM_store_selection(BMesh *em, void *data)
 {
 	BMEditSelection *ese;

source/blender/editors/mesh/bmeshutils.c

@@ -466,6 +466,9 @@ void EDBM_clear_flag_all(BMEditMesh *em, int flag)
 	BMHeader *ele;
 	int i, type;
 
+	if (flag & BM_SELECT)
+		BM_clear_selection_history(em->bm);
+
 	for (i=0; i<3; i++) {
 		switch (i) {
 			case 0: