Index: gdb/breakpoint.c
===================================================================
--- gdb.orig/breakpoint.c	2007-11-28 09:47:26.000000000 -0800
+++ gdb/breakpoint.c	2007-11-28 09:49:47.000000000 -0800
@@ -2969,7 +2969,7 @@
 	if (b->type == bp_watchpoint_scope)
 	  b->related_breakpoint->watchpoint_triggered = watch_triggered_yes;
 
-	if (bl->cond)
+	if (bl->cond && bl->owner->disposition != disp_del_at_next_stop)
 	  {
 	    /* Need to select the frame, with all that implies
 	       so that the conditions will have the right context.  */