[pkg-horde] [COMMIT reg sam--sid--0--patch-9] Merge with upstream

[Gregory Colpart]

2008-03-16  Gregory Colpart  <reg at evolix.fr>  patch-9

	* COPYING:
	* README:
	* blacklist.php:
	* config/attributes.php.dist:
	* config/backends.php.dist:
	* docs/CHANGES:
	* docs/INSTALL:
	* index.php:
	* lib/Driver.php:
	* lib/Driver/amavisd_sql.php:
	* lib/Driver/spamd.php:
	* lib/Driver/spamd_ftp.php:
	* lib/Driver/spamd_ldap.php:
	* lib/Driver/spamd_sql.php:
	* lib/SAM.php:
	* lib/api.php:
	* lib/base.php:
	* lib/version.php:
	* locale/cs_CZ/LC_MESSAGES/sam.mo:
	* locale/de_DE/LC_MESSAGES/sam.mo:
	* locale/es_ES/LC_MESSAGES/sam.mo:
	* locale/fi_FI/LC_MESSAGES/sam.mo:
	* locale/fr_FR/LC_MESSAGES/sam.mo:
	* locale/zh_TW/LC_MESSAGES/sam.mo:
	* po/de_DE.po:
	* po/sam.pot:
	* scripts/sql/amavisd_sql.mysql.sql:
	* scripts/sql/spamd_sql.mysql.sql:
	* scripts/sql/spamd_sql.pgsql.sql:
	* spam.php:
	* templates/common-header.inc:
	* themes/graphics/blacklist.png:
	* themes/graphics/sam.png:
	* themes/graphics/whitelist.png:
	* whitelist.php:
	+ config/.arch-ids/hooks.php.dist.id:
	+ config/hooks.php.dist:
	+ lib/Forms/.arch-ids/=id:
	+ lib/Forms/.arch-ids/Blacklist.php.id:
	+ lib/Forms/.arch-ids/Options.php.id:
	+ lib/Forms/.arch-ids/Whitelist.php.id:
	+ lib/Forms/Blacklist.php:
	+ lib/Forms/Options.php:
	+ lib/Forms/Whitelist.php:
	+ themes/silver/.arch-ids/=id:
	+ themes/silver/.arch-ids/themed_graphics.id:
	+ themes/silver/graphics/.arch-ids/=id:
	+ themes/silver/graphics/.arch-ids/blacklist.png.id:
	+ themes/silver/graphics/.arch-ids/favicon.ico.id:
	+ themes/silver/graphics/.arch-ids/sam.png.id:
	+ themes/silver/graphics/.arch-ids/whitelist.png.id:
	+ themes/silver/graphics/blacklist.png:
	+ themes/silver/graphics/favicon.ico:
	+ themes/silver/graphics/sam.png:
	+ themes/silver/graphics/whitelist.png:
	+ themes/silver/themed_graphics:
	- lib/.arch-ids/BlacklistForm.php.id:
	- lib/.arch-ids/OptionsForm.php.id:
	- lib/.arch-ids/WhitelistForm.php.id:
	- lib/BlacklistForm.php:
	- lib/OptionsForm.php:
	- lib/WhitelistForm.php:

	Merge with upstream

	Patches applied:

	 * pkg-horde-hackers at lists.alioth.debian.org--2006/sam--upstream--0--patch-2
	   Import CVS upstream of SAM 0.1

	 * pkg-horde-hackers at lists.alioth.debian.org--2006/sam--upstream--0--patch-3
	   Import Sam 0.1 from CVS