327383 - corrupt UI/bookmarks bar/all sorts of wackiness due to bug in bookmarks import. clear out frame's feed uri state when a new link is encountered r=brettw a=dbaron

browser/components/places/locale/places.dtd

@@ -208,6 +208,8 @@
   "Star (Off)">
 <!ENTITY location.status.bookmarked
   "Star (On)">
+<!ENTITY location.status.bookmark.tooltip
+  "Add a Bookmark to this page">
 <!ENTITY bookmark.property.panel.title
   "Bookmark Properties">
 <!ENTITY bookmark.property.title

browser/components/places/src/nsBookmarksHTML.cpp

@@ -558,6 +558,9 @@ BookmarkContentSink::HandleLinkBegin(const nsIParserNode& node)
 {
   BookmarkImportFrame& frame = CurFrame();
 
+  // We need to make sure that the feed URIs from previous frames are emptied. 
+  frame.mPreviousFeed = nsnull;
+
   // mPreviousText will hold our link text, clear it so that can be appended to
   frame.mPreviousText.Truncate();