sync with Kovid's branch
add garfield to .bzrignore
recipe for sportowefakty
Merge from trunk
Change  affiliate links for waterstone UK. They have dropped tradedoubler and moved to affiliate window. Don't know why I bother as they don't pay commisions on ebooks, but it was easy.
Sync to trunk.
remove DF as it is paywalled
add wysokie obcasy
change title of gazeta_pl flavors
minor fix for esensja rss
recipe for forbes.pl
icon for slashdot
Merge changes from lp:~cbhaley/calibre/charles_store.
Sync to trunk.
Updated Polish news sources
...
Get Books: Update Waterstones UK store plugin
Diario de Noticias by Jose Pinto
...
XSL cleanups