diff from 17357 and 40321

Description: bans IPs that cause multiple authentication errors for ssh/apache
 Monitors (in daemon mode) or just scans log files (e.g. /var/log/auth.log,
 /var/log/apache/access.log) and temporarily bans failure-prone
 addresses by updating existing firewall rules.  Currently, iptables,
 ipfwadm and ipfw are supported.
 .
 Homepage: http://www.sourceforge.net/projects/fail2ban

Description: bans IPs that cause multiple authentication errors
 Monitors log files (e.g. /var/log/auth.log,
 /var/log/apache/access.log) and temporarily or persistently bans
 failure-prone addresses by updating existing firewall rules. The
 software was completely rewritten at version 0.7.0 and now allows
 easy specification of different actions to be taken such as to ban an
 IP using iptables or hostsdeny rules, or simply to send a
 notification email. Currently, by default, supports ssh/apache/vsftpd
 but configuration can be easily extended for monitoring any other ASCII
 file. All filters and actions are given in the config files, thus
 fail2ban can be adopted to be used with a variety of files and
 firewalls.

--- 17357	Thu Jan  1 00:00:00 1970
+++ 40321	Thu Jan  1 00:00:00 1970
@@ -1,7 +1,12 @@
-bans IPs that cause multiple authentication errors for ssh/apache
+bans IPs that cause multiple authentication errors
- Monitors (in daemon mode) or just scans log files (e.g. /var/log/auth.log,
+ Monitors log files (e.g. /var/log/auth.log,
- /var/log/apache/access.log) and temporarily bans failure-prone
+ /var/log/apache/access.log) and temporarily or persistently bans
- addresses by updating existing firewall rules.  Currently, iptables,
+ failure-prone addresses by updating existing firewall rules. The
- ipfwadm and ipfw are supported.
+ software was completely rewritten at version 0.7.0 and now allows
- .
+ easy specification of different actions to be taken such as to ban an
- Homepage: http://www.sourceforge.net/projects/fail2ban
+ IP using iptables or hostsdeny rules, or simply to send a
+ notification email. Currently, by default, supports ssh/apache/vsftpd
+ but configuration can be easily extended for monitoring any other ASCII
+ file. All filters and actions are given in the config files, thus
+ fail2ban can be adopted to be used with a variety of files and
+ firewalls.