infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,747 Commits
7 Branches
556 Tags
421 MiB
Commit Graph

1452 Commits (13e09b102612ad022d12c546e03081c1a43181dd)

Author SHA1 Message Date
fab 043985ce90 uber test 
git-svn-id: file:///home/svn/framework3/trunk@5254 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 09:54:49 +00:00
HD Moore 5e2f1ea7cc More tempfile nonsense 
git-svn-id: file:///home/svn/framework3/trunk@5247 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 08:27:24 +00:00
HD Moore d6e5b0a25d Fix use of Tempfile 
git-svn-id: file:///home/svn/framework3/trunk@5246 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 08:20:48 +00:00
HD Moore 5131e4b747 Change the default payload back to a working one 
git-svn-id: file:///home/svn/framework3/trunk@5245 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 05:01:10 +00:00
HD Moore dfdc7d6dad Fix db_nmap on windows 
git-svn-id: file:///home/svn/framework3/trunk@5244 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 04:58:44 +00:00
HD Moore b7dc7dfe65 print command line output 
git-svn-id: file:///home/svn/framework3/trunk@5243 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 04:53:35 +00:00
HD Moore a396f655d5 Fixes to the sqlite3 database driver, the db_nmap command, and msfgui 
git-svn-id: file:///home/svn/framework3/trunk@5242 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 04:05:51 +00:00
HD Moore 2125254d1d Remove unused tag 
git-svn-id: file:///home/svn/framework3/trunk@5240 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 02:13:31 +00:00
HD Moore 9c54fecada Changes to about dialog, look for cmd+.exe as well 
git-svn-id: file:///home/svn/framework3/trunk@5239 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 02:03:13 +00:00
HD Moore 084fa6a7df browser/email hooks 
git-svn-id: file:///home/svn/framework3/trunk@5238 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 01:19:49 +00:00
HD Moore 3ebe718644 Minor tweaks to the GUI 
git-svn-id: file:///home/svn/framework3/trunk@5237 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 01:09:34 +00:00
HD Moore 016f4ece6a Change the sessions directory 
Refresh after kill and migrate



git-svn-id: file:///home/svn/framework3/trunk@5236 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 00:52:20 +00:00
HD Moore 275c91dfed Adds a border to the splash screen, puts framework initialization into post-flash part 
git-svn-id: file:///home/svn/framework3/trunk@5234 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 00:27:44 +00:00
HD Moore dde128f52c Add the splash screen, some reformatting 
git-svn-id: file:///home/svn/framework3/trunk@5233 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-31 00:23:33 +00:00
HD Moore 673388da92 Overlapping with the main tree === bad idea 
git-svn-id: file:///home/svn/framework3/trunk@5231 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-29 23:34:09 +00:00
HD Moore 7590cd9a85 Woops, add the msf3 directory to the path 
git-svn-id: file:///home/svn/framework3/trunk@5230 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-29 23:24:34 +00:00
HD Moore ab2654f3a0 Defaults for airpcap 
git-svn-id: file:///home/svn/framework3/trunk@5229 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-29 23:15:30 +00:00
HD Moore 91fbf5cccb Sync with the new windows directory path 
git-svn-id: file:///home/svn/framework3/trunk@5228 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-29 23:05:15 +00:00
HD Moore 94c81d866c Fix is a cpu loop bug in batch-mode scanner modules. This was apparent when using a RHOSTS set of 256 hosts but a THREADS count of > 1 with the UDP sweep module 
git-svn-id: file:///home/svn/framework3/trunk@5227 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-29 17:16:22 +00:00
HD Moore ad43a641f8 Patch from grutz (see #169). Added constants for SMB2 
git-svn-id: file:///home/svn/framework3/trunk@5226 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-27 17:42:32 +00:00
HD Moore fe91968665 Patch from Kris Katterjohn <katterjohn@gmail.com> inplements 'search' in msfconsole 
git-svn-id: file:///home/svn/framework3/trunk@5216 4d416f70-5f16-0410-b530-b9f4589650da
 2007-12-11 05:02:02 +00:00
HD Moore 6645a7256c Add the lcd command 
git-svn-id: file:///home/svn/framework3/trunk@5212 4d416f70-5f16-0410-b530-b9f4589650da
 2007-11-30 21:21:12 +00:00
Matt Miller 3b74c476a1 patch from Kris K 
git-svn-id: file:///home/svn/framework3/trunk@5210 4d416f70-5f16-0410-b530-b9f4589650da
 2007-11-29 06:57:14 +00:00
HD Moore 907282b061 Import version 0.9.1 of the rubyzip library 
git-svn-id: file:///home/svn/framework3/trunk@5208 4d416f70-5f16-0410-b530-b9f4589650da
 2007-11-28 22:21:58 +00:00
HD Moore 967a4c0fc6 Add x86 macho output support 
git-svn-id: file:///home/svn/framework3/trunk@5205 4d416f70-5f16-0410-b530-b9f4589650da
 2007-11-26 22:23:51 +00:00
HD Moore 293036bee8 fix the end of embedded mime messages (always end in \r\n) 
git-svn-id: file:///home/svn/framework3/trunk@5201 4d416f70-5f16-0410-b530-b9f4589650da
 2007-11-26 19:07:47 +00:00
HD Moore 3b9f9240b5 Bug noted by gh0st 
git-svn-id: file:///home/svn/framework3/trunk@5190 4d416f70-5f16-0410-b530-b9f4589650da
 2007-10-31 16:03:39 +00:00
Matt Miller 55ddf3865a encoder changes for context key support from druid 
git-svn-id: file:///home/svn/framework3/trunk@5177 4d416f70-5f16-0410-b530-b9f4589650da
 2007-10-23 20:07:55 +00:00
HD Moore 077bccbbe2 Patch from dustin 
git-svn-id: file:///home/svn/framework3/trunk@5161 4d416f70-5f16-0410-b530-b9f4589650da
 2007-10-19 14:26:56 +00:00
Matt Miller ddc3b15269 fix from bad commit 
git-svn-id: file:///home/svn/framework3/trunk@5159 4d416f70-5f16-0410-b530-b9f4589650da
 2007-10-19 06:48:26 +00:00
HD Moore 598568e079 New update from dustin 
git-svn-id: file:///home/svn/framework3/trunk@5157 4d416f70-5f16-0410-b530-b9f4589650da
 2007-10-18 20:42:00 +00:00
HD Moore 53f7b946ac Update to the context dumper from dustin 
git-svn-id: file:///home/svn/framework3/trunk@5156 4d416f70-5f16-0410-b530-b9f4589650da
 2007-10-18 20:26:24 +00:00
HD Moore 16a81d8c63 Switch to big endian byte order for context-map files 
git-svn-id: file:///home/svn/framework3/trunk@5155 4d416f70-5f16-0410-b530-b9f4589650da
 2007-10-18 16:55:55 +00:00
HD Moore ec94968d82 Add support for context-map files to msfpescan (http://sourceforge.net/projects/smem-map/) 
git-svn-id: file:///home/svn/framework3/trunk@5154 4d416f70-5f16-0410-b530-b9f4589650da
 2007-10-18 16:55:23 +00:00
HD Moore 21d971139b New HTTP NTLM code from Kurt Grutzmacher <grutz@jingojango.net> 
git-svn-id: file:///home/svn/framework3/trunk@5143 4d416f70-5f16-0410-b530-b9f4589650da
 2007-10-12 01:24:57 +00:00
HD Moore 6f79e14c91 Fixes #157. Patches from egypt@nmt.edu 
git-svn-id: file:///home/svn/framework3/trunk@5137 4d416f70-5f16-0410-b530-b9f4589650da
 2007-10-05 19:23:45 +00:00
Matt Miller aad6a6868b added EncoderDontFallThrough option, fixes #155 
git-svn-id: file:///home/svn/framework3/trunk@5132 4d416f70-5f16-0410-b530-b9f4589650da
 2007-10-02 03:36:45 +00:00
Matt Miller dc23f5b8dc default to first architecture in architecture array for egghunter, fixes #148 
git-svn-id: file:///home/svn/framework3/trunk@5131 4d416f70-5f16-0410-b530-b9f4589650da
 2007-10-02 03:24:21 +00:00
HD Moore 3b4adaff9c See #17 
git-svn-id: file:///home/svn/framework3/trunk@5128 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-30 17:54:15 +00:00
HD Moore ffc5c0a57d Use a class variable instead of a global to cache unicode code pages. 
git-svn-id: file:///home/svn/framework3/trunk@5126 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-29 06:47:16 +00:00
HD Moore ceb69bb541 Overhaul of the ruby-lorcon module to match pylorcon. 
git-svn-id: file:///home/svn/framework3/trunk@5124 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-28 06:51:32 +00:00
Patrick Webster 09485b52e7 First commit. Added Netcat NT module. 
git-svn-id: file:///home/svn/framework3/trunk@5123 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-26 13:44:25 +00:00
HD Moore 1527d92154 Correct offset typos in the new iphone modules. Add EXE output support for OS X PPC, Linux x86, and make the OS X ARM smaller. 
git-svn-id: file:///home/svn/framework3/trunk@5119 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-25 01:50:05 +00:00
HD Moore cbec13de60 Add "X" mode for iPhone payloads 
git-svn-id: file:///home/svn/framework3/trunk@5117 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-24 17:54:51 +00:00
HD Moore 621849beaf One more bad exception to fix 
git-svn-id: file:///home/svn/framework3/trunk@5114 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-24 04:58:26 +00:00
HD Moore 7498562eb5 Add proxy support to HTTP mixin using modules. Fix socks proxy support. 
git-svn-id: file:///home/svn/framework3/trunk@5113 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-24 04:44:44 +00:00
HD Moore acc4fd966a Add ARMLE/ARMBE 
git-svn-id: file:///home/svn/framework3/trunk@5112 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-24 03:16:50 +00:00
HD Moore 8c844f96b0 Fixes #60. Adds a new block_command() method to the console, which allows a UI to disable certain commands at runtime. 
git-svn-id: file:///home/svn/framework3/trunk@5109 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-22 20:20:10 +00:00
HD Moore f832df480a Fixes #8. Resets the tab completion routine after session interaction. 
git-svn-id: file:///home/svn/framework3/trunk@5108 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-22 19:53:39 +00:00
HD Moore 7cc30f0fa8 Support pattern_create() lengths larger than the maximum set size 
git-svn-id: file:///home/svn/framework3/trunk@5104 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-13 16:11:33 +00:00
fab 875b7ebfb4 fix #137 (thx to Glenn to report it) 
git-svn-id: file:///home/svn/framework3/trunk@5102 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-11 19:49:05 +00:00
HD Moore 6f23487daa Fixes #117. No longer treat connection: close as a stop-processing case 
git-svn-id: file:///home/svn/framework3/trunk@5090 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-09 22:27:27 +00:00
HD Moore 00beaa7049 Fixes #136. Detects a nil str parameter 
git-svn-id: file:///home/svn/framework3/trunk@5088 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-09 22:10:38 +00:00
HD Moore 59120eafb2 Adds rand_text_numeric wrapper to the exploit class 
git-svn-id: file:///home/svn/framework3/trunk@5086 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-05 13:40:41 +00:00
HD Moore 448714ab7b Adds rand_text_numeric 
git-svn-id: file:///home/svn/framework3/trunk@5085 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-05 13:39:45 +00:00
Matt Miller 23da91742e the tag used for find tag must be sent BEFORE the intermediate stage 
git-svn-id: file:///home/svn/framework3/trunk@5084 4d416f70-5f16-0410-b530-b9f4589650da
 2007-08-31 17:39:54 +00:00
Matt Miller 1ae7bef139 removed debug puts 
git-svn-id: file:///home/svn/framework3/trunk@5082 4d416f70-5f16-0410-b530-b9f4589650da
 2007-08-31 04:03:26 +00:00
Matt Miller f61cde59c4 initial support for context encoding 
git-svn-id: file:///home/svn/framework3/trunk@5081 4d416f70-5f16-0410-b530-b9f4589650da
 2007-08-31 04:01:30 +00:00
Matt Miller bf935736b6 fix flushing to account for suffix 
git-svn-id: file:///home/svn/framework3/trunk@5078 4d416f70-5f16-0410-b530-b9f4589650da
 2007-08-13 01:32:32 +00:00
Matt Miller 3f903a4e24 fix from spoonm 
git-svn-id: file:///home/svn/framework3/trunk@5077 4d416f70-5f16-0410-b530-b9f4589650da
 2007-08-11 07:09:13 +00:00
Matt Miller 7b65a56d65 initial support for metasm integration, ported sample payload to use it 
git-svn-id: file:///home/svn/framework3/trunk@5076 4d416f70-5f16-0410-b530-b9f4589650da
 2007-08-11 00:37:50 +00:00
Matt Miller 89d0e200f6 fix portfwd command not functioning properly 
git-svn-id: file:///home/svn/framework3/trunk@5075 4d416f70-5f16-0410-b530-b9f4589650da
 2007-08-10 23:54:26 +00:00
Matt Miller b698d99209 catch IOError that may be raised when closing a socket that is already closed, fixes #61 
git-svn-id: file:///home/svn/framework3/trunk@5074 4d416f70-5f16-0410-b530-b9f4589650da
 2007-08-10 23:09:00 +00:00
HD Moore dbf2df3ec4 Remove calls to reset_ui which break background exploit output 
git-svn-id: file:///home/svn/framework3/trunk@5070 4d416f70-5f16-0410-b530-b9f4589650da
 2007-08-08 04:30:11 +00:00
HD Moore bff51b5578 Typo fix 
git-svn-id: file:///home/svn/framework3/trunk@5067 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-30 05:21:02 +00:00
Ramon de C Valle f60810d00c Added more advanced payload options and advanced payload options support for Solaris. 
git-svn-id: file:///home/svn/framework3/trunk@5060 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-25 03:24:51 +00:00
HD Moore 4c650f865b It helps when the new hash is actually used... 
git-svn-id: file:///home/svn/framework3/trunk@5055 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-17 19:01:04 +00:00
HD Moore 84370e82aa Force the port parameter to be an integer, since some db drivers expect this. 
git-svn-id: file:///home/svn/framework3/trunk@5054 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-17 18:42:26 +00:00
HD Moore b21fb10f75 Fixes #120. Applies a one-line patch from egypt[at]nmt.edu 
git-svn-id: file:///home/svn/framework3/trunk@5053 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-16 13:52:11 +00:00
HD Moore b4fab66d40 Fixes #128. Applying a one-line typo fix from antoine. Thanks! 
git-svn-id: file:///home/svn/framework3/trunk@5052 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-16 13:43:52 +00:00
HD Moore 1f2791494b General cleanups, bug fixes, removal of debugging statements. 
git-svn-id: file:///home/svn/framework3/trunk@5051 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-16 02:17:32 +00:00
HD Moore 2fd4bf1579 Adds support for array arguments to Rex::Arch.endian(). This solves a problem where some exploits choose the wrong unescape method. 
git-svn-id: file:///home/svn/framework3/trunk@5050 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-16 01:23:17 +00:00
HD Moore 24aac8b5ae Fixes #127. Applying patch from Alex that solves ASN.1 encoding issues. 
git-svn-id: file:///home/svn/framework3/trunk@5049 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-16 01:13:25 +00:00
Ramon de C Valle f3dd74cfc9 Added advanced payload options for *BSD, improved solaris targets of lsa_transnames_heap.rb, some code cleanups. 
git-svn-id: file:///home/svn/framework3/trunk@5044 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-11 03:19:28 +00:00
fab 181135dd06 minor update 
git-svn-id: file:///home/svn/framework3/trunk@5043 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-10 20:52:20 +00:00
HD Moore 240ad73d6a Added --rip mode to msfpescan :) 
git-svn-id: file:///home/svn/framework3/trunk@5041 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-09 18:17:04 +00:00
HD Moore 37c0376d73 Add file names to the resource output 
git-svn-id: file:///home/svn/framework3/trunk@5040 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-09 05:06:01 +00:00
HD Moore 9aa34702dd Fix a typo which prevented the set() method from working correctly. 
git-svn-id: file:///home/svn/framework3/trunk@5036 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-07 03:12:42 +00:00
HD Moore 1f0cd480e5 This commit adds --info support to msfpescan 
git-svn-id: file:///home/svn/framework3/trunk@5034 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-06 05:14:05 +00:00
Ramon de C Valle 99f806b0e9 Added OSX payloads advanced options and improved Samba exploit module. 
git-svn-id: file:///home/svn/framework3/trunk@5033 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-06 01:22:54 +00:00
fab 6096c4347a shell and meterpreter console signals 
git-svn-id: file:///home/svn/framework3/trunk@5029 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-04 21:23:30 +00:00
fab 883f33759b meterpreter console (shell) 
git-svn-id: file:///home/svn/framework3/trunk@5027 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-03 23:01:50 +00:00
fab 49e63b95b5 commit for debug with skape 
git-svn-id: file:///home/svn/framework3/trunk@5026 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-03 20:55:24 +00:00
HD Moore e4e674003d Correct the super() call in http's regenerate_payload() 
git-svn-id: file:///home/svn/framework3/trunk@5025 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-03 13:40:45 +00:00
HD Moore 0c6d0e5941 This code IS in a mixin now, remove the old comment :) 
git-svn-id: file:///home/svn/framework3/trunk@5024 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-03 04:39:58 +00:00
HD Moore 30bf0667d8 cosmetic 
git-svn-id: file:///home/svn/framework3/trunk@5023 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-03 04:39:18 +00:00
HD Moore ddadf74a85 Fix a typo that could break regenerate_payload 
git-svn-id: file:///home/svn/framework3/trunk@5022 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-03 04:38:56 +00:00
HD Moore a21ec0a73c Updating the php_include_url function to figure out the server address a little bit better. 
git-svn-id: file:///home/svn/framework3/trunk@5019 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-03 04:26:28 +00:00
HD Moore e01ed7a606 Updated METASM hg directory 
git-svn-id: file:///home/svn/framework3/trunk@5018 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-03 04:22:55 +00:00
HD Moore d0b15d3d72 Lots of SMB fun, all preparation for Black Hat talk :-) More to come... 
git-svn-id: file:///home/svn/framework3/trunk@5015 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-03 04:20:50 +00:00
fab 9a8a3096b4 binding the meterpreter console 
git-svn-id: file:///home/svn/framework3/trunk@5013 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-02 19:25:42 +00:00
fab 664b15237b Add a basic command history to MsfConsole (shell and meterpreter) 
git-svn-id: file:///home/svn/framework3/trunk@5012 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-02 18:37:04 +00:00
fab 7ebcf6413a Add comments and cleanup 
git-svn-id: file:///home/svn/framework3/trunk@5011 4d416f70-5f16-0410-b530-b9f4589650da
 2007-07-02 15:57:36 +00:00
HD Moore 4a204efaa1 Import the new METASM code 
git-svn-id: file:///home/svn/framework3/trunk@5008 4d416f70-5f16-0410-b530-b9f4589650da
 2007-06-30 21:53:26 +00:00
Matt Miller 525319fbd1 default to no badchars 
git-svn-id: file:///home/svn/framework3/trunk@5006 4d416f70-5f16-0410-b530-b9f4589650da
 2007-06-29 00:29:29 +00:00
fab 9fcc1d33f5 The method used by Gtk2::Console::Meterpreter is not the best way. 
Use the meterpreter API instead.

git-svn-id: file:///home/svn/framework3/trunk@5005 4d416f70-5f16-0410-b530-b9f4589650da
 2007-06-27 21:41:44 +00:00
fab dda8877c62 Module category without any bindings are commented 
git-svn-id: file:///home/svn/framework3/trunk@5002 4d416f70-5f16-0410-b530-b9f4589650da
 2007-06-26 21:24:16 +00:00
fab 577196c774 New console for shell and meterpreter session, with handler keys 
git-svn-id: file:///home/svn/framework3/trunk@5001 4d416f70-5f16-0410-b530-b9f4589650da
 2007-06-26 21:09:30 +00:00
fab a57bbb0f69 improve the jobs stuff 
git-svn-id: file:///home/svn/framework3/trunk@5000 4d416f70-5f16-0410-b530-b9f4589650da
 2007-06-24 19:48:09 +00:00
fab 23f9708c6d git-svn-id: file:///home/svn/framework3/trunk@4998 4d416f70-5f16-0410-b530-b9f4589650da 2007-06-20 21:02:31 +00:00