Merge svn revisions 997 and 1000 from Zebra cvs repository.
diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c
index d707ee7..4452e62 100644
--- a/ospf6d/ospf6_intra.c
+++ b/ospf6d/ospf6_intra.c
@@ -1302,6 +1302,9 @@
       if (lsentry->path.area_id != oa->area_id)
         continue;
 
+      if (CHECK_FLAG (lsentry->flag, OSPF6_ROUTE_WAS_REMOVED))
+        continue;
+
       if (CHECK_FLAG (lsentry->flag, OSPF6_ROUTE_REMOVE) &&
           CHECK_FLAG (lsentry->flag, OSPF6_ROUTE_ADD))
         {