github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity
4,556 Commits
32 Branches
229 Tags
18 MiB
Commit Graph

178 Commits (0befbfd76663e2cd45fc1478eeb9bf3af2958364)

Author SHA1 Message Date
Steven Hiscocks 77aa523f22 Merge branch 'master' into py3 
Conflicts:
	.travis.yml
	server/datetemplate.py
	server/server.py
	testcases/filtertestcase.py
 2013-03-30 22:51:36 +00:00
Steven Hiscocks d30f6a2d66 add fail2ban-2to3 to MANIFEST file 2013-03-30 21:40:42 +00:00
Yaroslav Halchenko e86addf171 Merge branch 'misc-fixes' of https://github.com/grooverdan/fail2ban 
Conflicts:
	testcases/servertestcase.py -- excluded all the changes to this file,
      since they were  conflicting and actually not needed (yet at least)

* 'misc-fixes' of https://github.com/grooverdan/fail2ban:
  PKG: change email that I want in RPMs
  BF: defer testSocket for later
  DOC: Defin{a,i}tion
  DOC: add fail2ban.1 manual page
  DOC: init -> Init, defination -> Defination. Improved intro
  DOC: punishment claimed
  BF: add missing items from MANIFEST, used by python setup.py sdist
  DOC: tags are documented in the jail.conf(5) man page
  ENH: add test case for testing socket
  ENH: jail.conf man page
  ENH: git ignore failed patch reminants
  BF: remove non-existant files from setup.py. ENH: add documentation
  ENH: packaging information for RPM builds
  completed items from TODO list
 2013-03-24 21:19:26 -04:00
Daniel Black b5cbee9e65 DOC: add fail2ban.1 manual page 2013-03-23 20:12:31 +11:00
Steven Hiscocks 43b8a66482 Update MANIFEST with and author of testcases/sockettestcase.py 2013-03-17 09:18:14 +00:00
Daniel Black 936a29f7a6 BF: add missing items from MANIFEST, used by python setup.py sdist 2013-03-17 12:31:29 +11:00
Daniel Black 3665e6dc44 Add development documentation and framework for code coverage measurement 2013-03-10 15:18:42 +11:00
Lee Clemens e442503133 Added pyinotify backend 2011-12-30 00:18:52 -05:00
Yaroslav Halchenko 90167a1bef DOC: moved THANKS into a THANKS file for better visibility, concise README 2011-10-03 15:21:35 -04:00
Cyril Jaquier f0f96a6cfd - Moved last entries in the config/ part. 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@743 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2009-08-30 14:21:41 +00:00
Arturo 'Buanzo' Busleiman dde7afe1f3 added two new filter files (PHP url_fopen, lighttpd fastcgi alerts), updated MANIFEST and jail.conf accordingly 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@742 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2009-08-30 14:17:29 +00:00
Cyril Jaquier b88956e898 - Added helper module in common. 
- Moved formatExceptionInfo by Buanzo to common/helpers.py.

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@740 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2009-08-30 14:03:18 +00:00
Cyril Jaquier 7fd0300a73 - Added cyrus-imap and sieve filters. Thanks to Jan Wagner. Debian bug #513953. 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@727 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2009-02-03 22:37:46 +00:00
Cyril Jaquier e16c18d091 - Added NetBSD ipfilter (ipf command) action. Thanks to Ed Ravin. Tracker #2484115. 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@724 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2009-01-27 23:39:38 +00:00
Cyril Jaquier 756cfcda5f - Added nagios script. Thanks to Sebastian Mueller. 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@721 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2009-01-27 22:58:29 +00:00
Cyril Jaquier 6cd56802bb - Added actions to report abuse to ISP, DShield and myNetWatchman. Thanks to Russell Odom. 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@717 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2008-10-13 14:56:54 +00:00
Cyril Jaquier bb8e610795 - Added apache-nohome.conf. Thanks to Yaroslav Halchenko. 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@715 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2008-10-13 14:37:25 +00:00
Cyril Jaquier 298adc4d43 - Added ISO 8601 date/time format. 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@692 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2008-05-18 19:53:18 +00:00
Cyril Jaquier a32f04b0cb - Added gssftpd filter. Thanks to Kevin Zembower. 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@683 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2008-04-07 22:41:19 +00:00
Cyril Jaquier d9f9a31802 - Added "pam-generic" filter and more configuration fixes. Thanks to Yaroslav Halchenko. 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@677 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2008-03-10 22:03:34 +00:00
Cyril Jaquier e7eaf5c488 - Fixed Debian bug #461426 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@667 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2008-03-05 22:35:09 +00:00
Cyril Jaquier f77057d3dd - Fixed Debian bug #462060 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@666 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2008-03-05 22:23:41 +00:00
Cyril Jaquier ead3e50c97 - Fixed Debian bug #456567 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@664 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2008-03-05 21:47:59 +00:00
Cyril Jaquier c79e9ecec5 - Added Mac OS/X startup script. Thanks to Bill Heaton. 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@654 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2008-03-04 00:10:30 +00:00
Cyril Jaquier c25790ad36 - Renamed CHANGELOG to ChangeLog. 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@651 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2008-02-06 20:17:12 +00:00
Cyril Jaquier eae650fdfc - Refactoring. Merged failticket and banticket into ticket. 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@638 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2007-12-17 20:00:36 +00:00
Cyril Jaquier c07a7a6e7a - Refactoring. Reduced number of files. 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@633 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2007-12-16 18:05:07 +00:00
Cyril Jaquier 5bd32566c3 - Moved socket to /var/run/fail2ban. 
- Rewrote the communication server.

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@628 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2007-12-14 21:19:00 +00:00
Cyril Jaquier 66063d2731 - Added "full line failregex" patch. Thanks to Yaroslav Halchenko. It will be possible to create stronger failregex against log injection 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@621 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2007-09-12 21:38:51 +00:00
Cyril Jaquier b2a79a5e49 - Added new files 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@612 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2007-08-08 22:52:42 +00:00
Cyril Jaquier 9ac663a121 - Added webmin authentication filter. Thanks to Guillaume Delvit 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@601 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2007-07-11 22:27:16 +00:00
Cyril Jaquier 568264d6c7 - Updated suse-initd and added it to MANIFEST. Thanks to Christian Rauch 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@597 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2007-07-10 20:04:57 +00:00
Cyril Jaquier 08c2c55742 - Added sendmail actions. The action started with "mail" are now deprecated. Thanks to Raphaël Marichez 
- Fixed a small typo

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@595 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2007-07-05 16:10:33 +00:00
Cyril Jaquier c045a20152 - Added Solaris 10 files 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@576 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2007-05-03 20:04:44 +00:00
Cyril Jaquier ee234d424c - Added pure-ftpd filter. Thanks to Yaroslav Halchenko 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@560 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2007-03-19 20:32:28 +00:00
Cyril Jaquier b4caed8c00 - Added new filter for spam bots 
- Added new action for buffered mails

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@549 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2007-02-12 21:50:50 +00:00
Cyril Jaquier 13f52e17a0 - Updated with new cacti files 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@542 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2007-02-08 19:32:18 +00:00
Cyril Jaquier 54ef4ef33b - Added initial cacti script. Still needs testing, template, etc 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@527 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2007-01-29 20:25:50 +00:00
Cyril Jaquier 04cd3f5bd5 - Added new filters/actions. Thanks to Yaroslav Halchenko 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@520 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2007-01-08 21:40:37 +00:00
Cyril Jaquier ba833a57ad - Added license file. Thanks to Axel Thimm 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@506 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2007-01-03 18:15:55 +00:00
Cyril Jaquier 0f31cc0feb - Added support for several "failregex" and "ignoreregex". This should simplify the configuration files. 
- Configuration files are backward-compatible but need to be updated in order to take advantage of this feature.

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@503 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-12-23 16:31:00 +00:00
Cyril Jaquier 58acd9fb9f - Moved version.py and protocol.py to common/ 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@467 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-11-16 21:07:42 +00:00
Cyril Jaquier a8299b4247 - Added "protocol.py" which describes the protocol used to communicate with the server 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@461 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-11-12 21:58:47 +00:00
Cyril Jaquier 5c668c8fed - Added action test case 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@429 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-10-23 20:13:21 +00:00
Cyril Jaquier f74657f4b6 - Added "courierlogin" filter. Thanks to Christoph Haas 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@427 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-10-22 23:49:10 +00:00
Cyril Jaquier eaea181f68 - Added log files for the test cases 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@426 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-10-19 21:52:28 +00:00
Cyril Jaquier 51fd8fac27 - Added ipfw action script and example. Thanks to Nick Munger 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@421 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-10-19 20:15:24 +00:00
Cyril Jaquier af41290fc6 - Added the class MyTime. Replaces call to time.time() and time.gmtime(). A fixed time value can be set for testing purpose 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@418 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-10-18 22:30:57 +00:00
Cyril Jaquier 15a4634c38 - Added "shorewall" action 
- Use glob in setup.py

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@413 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-10-17 21:13:11 +00:00
Cyril Jaquier ebae6d70aa - Added "apache-noscript" filter. Thanks to Pander 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@411 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-10-17 19:05:27 +00:00
Cyril Jaquier e28fec6d5d - Added Fedora/RedHat initd script. Thanks to Tyler 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@408 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-10-14 14:35:46 +00:00
Cyril Jaquier d231a8ca6f - Added proftpd.conf and sasl.conf 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@403 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-10-02 21:15:32 +00:00
Cyril Jaquier f479b71550 - Removed dummy.conf from build 
- Added fail2ban-regex and help2man files

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@400 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-10-01 21:24:08 +00:00
Cyril Jaquier 88b68c0ad2 - Replaced jails = dict() with a Jails class for better concurrency control 
- Set umask to 0077 at startup for security reason

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@357 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-09-17 21:59:29 +00:00
Cyril Jaquier 7f7361a282 - Added Gamin (file and directory monitoring system) support 
- If Gamin is not available, polling is used

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@355 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-09-14 22:05:32 +00:00
Cyril Jaquier b03d4d38bf - Updated (man pages) 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@351 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-09-12 21:40:19 +00:00
Cyril Jaquier df26a74d53 - Updated 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@346 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-09-10 20:53:21 +00:00
Cyril Jaquier 1c3088b267 - Added new action 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@334 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-09-06 21:19:58 +00:00
Cyril Jaquier b1160ab7ca - Added qmail and postfix filters 
- Updated vsftpd and couriersmtp

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@331 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-09-06 19:34:03 +00:00
Cyril Jaquier a998e54bb9 - Added "fail2ban-regex". This is a tool to help finding "failregex" 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@329 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-09-06 18:25:11 +00:00
Cyril Jaquier 438f0e8122 - Added date detector 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@326 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-09-05 21:17:35 +00:00
Cyril Jaquier 6456676d35 - Added a couriersmtpd filter 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@318 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-08-30 22:17:49 +00:00
Cyril Jaquier db868e4999 - Added beautifier.py 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@312 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-08-28 20:22:58 +00:00
Cyril Jaquier 5c6e05f922 - Added Gentoo init.d script 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@304 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-08-23 20:56:31 +00:00
Cyril Jaquier 15f0d6357b - Added setup.cfg 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@295 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-08-22 23:17:08 +00:00
Cyril Jaquier 432bd3a04c - MANIFEST was broken 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@287 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-08-22 21:18:58 +00:00
Cyril Jaquier 12c222bd1c - One step forward to 0.7.0 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@250 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-07-08 16:51:14 +00:00
Cyril Jaquier ad4280d506 - Updated 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@234 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2006-01-22 11:08:42 +00:00
Cyril Jaquier 840f6cd052 - Merged FAIL2BAN-0_5 with HEAD 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@216 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2005-11-20 17:07:47 +00:00
Cyril Jaquier 73ff1540e8 - Prepared for 0.4.1 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@111 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2005-06-30 09:30:59 +00:00
Cyril Jaquier 54f2fc0ae5 - Added utils/__init__.py and utils/dns.py 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@83 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2005-03-06 17:52:53 +00:00
Cyril Jaquier 16dbc44607 - Added TODO file 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@58 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2005-02-20 11:15:06 +00:00
Cyril Jaquier 2b5812ef9b - parser.py no more needed 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@56 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2005-02-18 21:53:16 +00:00
Cyril Jaquier 2e5bfe5bb6 - Changed Fail2Ban in order to handle several log files 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@50 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2005-02-18 13:30:54 +00:00
Cyril Jaquier 88313ea611 - Add firewall/ipfw.py and firewall/ipfwadm.py 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@45 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2004-11-06 14:04:34 +00:00
Cyril Jaquier f1d7157cae - Add config/fail2ban.conf.default 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@34 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2004-10-16 22:17:35 +00:00
Cyril Jaquier 1786004c3d - Add logreader/parser.py and logreader/sshd.py 
- Remove logreader/metalog.py


git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@25 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2004-10-14 10:27:27 +00:00
Cyril Jaquier 03d73b78f8 - Setup and dist files 
git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/trunk@22 a942ae1a-1317-0410-a47c-b1dcaea8d605
 2004-10-12 21:45:41 +00:00