From 693fd3ccb93efdcd735402bc8a676472f9b4b4c1 Mon Sep 17 00:00:00 2001
From: mp3geek <mp3geek@gmail.com>
Date: Sun, 11 Jul 2010 09:08:55 +1200
Subject: [PATCH] fix up mis-merge

---
 fanboy-adblocklist-current-expanded.txt | 32 +++++++++++++++++++++----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/fanboy-adblocklist-current-expanded.txt b/fanboy-adblocklist-current-expanded.txt
index 44d63023b..00c7258dd 100644
--- a/fanboy-adblocklist-current-expanded.txt
+++ b/fanboy-adblocklist-current-expanded.txt
@@ -1,5 +1,5 @@
 [Adblock Plus 1.1]
-! Checksum: tfQ49V5m/zVqscKGuLqsNw
+! Checksum: HJr71ceTwM5EwJir+IaUJg
 ! Fanboy's Adblock list
 ! Updated: 11 Jul 2010
 ! This list expires after 5 days
@@ -257,6 +257,7 @@
 /adjs.php?
 /adjs/iframe
 /adjs_mod
+/adkit/js/*
 /adlabel_horz
 /adlayer
 /adloader.
@@ -604,6 +605,7 @@
 /fan-ads.$script
 /fc_ads/*
 /feeds/jobroll/?
+/file/ad.
 /files/adman/*
 /flash/advertis
 /flash_advertising/*
@@ -673,6 +675,7 @@
 /ifb/google_afc.
 /iframe.ad/*
 /iframe/ad/*
+/iframe_ad_
 /iframe/ads/*
 /iframe_ads?
 /iframe_chitika_
@@ -2601,7 +2604,7 @@ receeve.it##.carousel
 300x250.gif
 300x250.htm
 300x250.jpeg
-300x250.jpg$domain=~mydamnchannel.com
+300x250.jpg$domain=~mydamnchannel.com|~fanhouse.com
 300x250.php|
 300x250.png
 300x250.swf
@@ -2892,6 +2895,7 @@ sz=47x47;
 @@/728x90/*$domain=weather.weatherbug.com
 @@=300x250&$domain=batman-on-film.com
 @@=728x90&$domain=pkra.com,subdocument
+@@_125x125.$domain=fanhouse.com
 @@_140x140$domain=guardian.co.uk
 @@_728x90.$domain=weather.weatherbug.com|smokescreen.us
 @@|http://www.imdb.com/images/*doubleclick/*
@@ -2965,6 +2969,7 @@ sz=47x47;
 /imlive.gif
 /impopup/*
 /js/awe.js$script
+/js/youmuffpu.js
 /JTCASHBANNERS/*
 /kaksvpopup.js
 /layout.inc.php?img
@@ -4011,6 +4016,7 @@ youporn.com###producer
 ###adlabel
 ###adlayer
 ###adLContain
+###adLeaderboard
 ###adleaderboard
 ###adleaderboardb
 ###adlinks
@@ -4252,6 +4258,7 @@ youporn.com###producer
 ###articleSideAd                                                                                   
 ###articleview_ad
 ###aside_ad
+###asinglead
 ###awesome-ad
 ###b5-skyscraper-ad-3
 ###b5_ad_footer
@@ -4425,6 +4432,7 @@ youporn.com###producer
 ###featured_ad_links
 ###featuredSponsors
 ###ffsponsors
+###firstad
 ###first-300-ad
 ###first_ad_unit
 ###floatingAd
@@ -4554,6 +4562,7 @@ youporn.com###producer
 ###iframe_ad_728
 ###iframe_container300x250
 ###imu
+###indexad
 ###in_post_ad_middle_1
 ###inlineAd
 ###inlinead
@@ -4563,6 +4572,7 @@ youporn.com###producer
 ###interruptor
 ###island_ad_top
 ###islandAd
+###item-detail-feature-ad
 ###itemGroupAd2
 ###Journal_Ad_125
 ###Journal_Ad_300
@@ -4778,6 +4788,7 @@ youporn.com###producer
 ###SidebarAdContainer
 ###sidebargooglead
 ###sideline-ad
+###singlead
 ###single-mpu
 ###site-leaderboard-ads
 ###site_top_ad
@@ -5339,6 +5350,8 @@ youporn.com###producer
 ##.adsection_c2
 ##.AdSense
 ##.adSense
+##.adsense-reviews-float
+##.adsense-float
 ##.adsense-heading
 ##.adsense-post
 ##.adsense-title
@@ -5515,6 +5528,7 @@ youporn.com###producer
 ##.big-ads
 ##.bigAd
 ##.bigad
+##.blogads
 ##.bigad1
 ##.bigad2
 ##.bigbox_ad
@@ -5549,6 +5563,7 @@ youporn.com###producer
 ##.box.ad
 ##.Box2.Ad
 ##.box_ad
+##.box_advertising
 ##.box_ad_wrap
 ##.box_ads
 ##.box_ads728x90_holder
@@ -5639,10 +5654,13 @@ youporn.com###producer
 ##.google-ad
 ##.google-ad-container
 ##.google-ads
+##.google-ads-slim
+##.google-adsense
 ##.google-ads-boxout
 ##.google-right-ad
 ##.google_ad
 ##.google_ad_right
+##.google_ad336
 ##.google_add_container
 ##.google_ads_content
 ##.GoogleAd
@@ -5993,6 +6011,7 @@ youporn.com###producer
 ##.squareAdd
 ##.squareAddtwo
 ##.squared_ad
+##.SquareAd
 ##.standard-ad
 ##.staticAd
 ##.story-ad
@@ -6100,7 +6119,6 @@ youporn.com###producer
 !
 !---------------------- Site specific hiding rules ----------------------
 !
-##.google-ads-slim
 123people.co.uk###l_banner
 123people.co.uk##.cb_navigation_ad
 2flashgames.com##[style="width: 160px; text-align: center; background-color: rgb(255, 255, 255); padding: 5px 0px;"]
@@ -6173,6 +6191,7 @@ animenfo.com##.nav2
 animetake.com##.top-banner
 anonymouse.org###mouselayer
 answers.com###th1
+answers.com###radLinks
 answers.com##[style="float: right; margin-top: 0px; color: rgb(173, 173, 173);"]
 answers.com##[style="margin-left: 7px; margin-top: 10px; border-bottom: 1px solid rgb(173, 173, 173); color: rgb(173, 173, 173); float: left; clear: both; width: 609px;"]
 anzwers.com.au##[style="padding: 5px 0pt;"]
@@ -6305,6 +6324,7 @@ break.com##.breaking_news_wrap
 break.com##.brk_ldrbrd_wrap
 break.com##[width="300"][height="250"]
 breitbart.com##.sidebar
+briefmobile.com##[style="height: 90px; width: 960px; background-color: rgb(255, 255, 255); padding: 10px; vertical-align: middle;"]
 bridgebase.com###bbo_ad1
 brothersoft.com##.search_sponor
 browsers.about.com##IFRAME#ip0[width="336"][height="210"]
@@ -6805,8 +6825,8 @@ gamingxp.com###main_skyscraper
 gamingxp.com##TABLE[style="width: 100%;"]
 gawker.com###skyscraper
 gearlive.com###google
-gearlive.com##.box.wellvert
-gearlive.com##.double.clearfix
+gearlive.com##.wellvert
+gearlive.com##.double
 geek.com##.picksBox
 geek.com##.top
 geeksugar.com###rect2
@@ -6895,6 +6915,7 @@ haloscan.com##[style="margin: 0pt auto; width: 125px;"]
 haloscan.com##[style="margin: 0pt auto; width: 234px;"]
 haloscan.com##[style="margin: 0pt auto; width: 260px;"]
 haloscan.com##[style="margin: 0pt auto; width: 278px;"]
+hardballtalk.nbcsports.com###top_90h
 hardocp.com###announcements
 harpers.org##.topbanner
 hellmode.com###header
@@ -7186,6 +7207,7 @@ manoramaonline.com##td[width="165"]
 manuals-search-engine.com##[style="height: 70px;"]
 manuals-search-engine.com##TD[style="height: 35px;"]
 maps.google.com###mclip
+marketingmag.ca###leaderboard_container
 marketingvox.com##.jupitermedia
 marketwatch.com###story-premiumbanner
 marketwatch.com###tradingcenter