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

292 Commits (b5e7009283a8ffc6899feb959464e2a80656f48c)

Author SHA1 Message Date
Stephen Fewer 9f4332ce60 bug fix for the stdapi command rev2self. was not playing nice with new thread token stuff. 
git-svn-id: file:///home/svn/framework3/trunk@8291 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-28 13:33:24 +00:00
Stephen Fewer 095b6ee7ed move these macros from base_dispatch.c to common.h as they are useful to use elsewhere. 
git-svn-id: file:///home/svn/framework3/trunk@8290 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-28 13:32:16 +00:00
Stephen Fewer 4e4a65b9a4 Complete overhaul of process migration. Migration across x86->x86, x64->x64, wow64->x64 and x64->wow64 all supported using a number of techniques. 
git-svn-id: file:///home/svn/framework3/trunk@8198 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-22 19:46:18 +00:00
Stephen Fewer 159e240f3a updated stapi project file. 
git-svn-id: file:///home/svn/framework3/trunk@8158 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-19 11:07:21 +00:00
Stephen Fewer 757276d70f First cut for improved process listing. Now works well on NT4 and up. One issue with getting the path for x64 processes on an x86 meterpreter. 
git-svn-id: file:///home/svn/framework3/trunk@8156 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-19 10:40:02 +00:00
Stephen Fewer 0286a67f1e small bug fix to get getuid working on NT4 
git-svn-id: file:///home/svn/framework3/trunk@8155 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-19 10:36:12 +00:00
HD Moore 42b3a5774d Adds the process username to the ps output (when possible). 
git-svn-id: file:///home/svn/framework3/trunk@8056 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-02 03:41:21 +00:00
HD Moore 4d7aec7c2d Fixes #745. This commit changes how token manipulation works, adds the steal_token, drop_token, and getprivs commands. Tested on NT 4.0, 2000 SP4, XP SP3, 2003 SP2, Vista, and Windows 7 
git-svn-id: file:///home/svn/framework3/trunk@8055 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-02 00:35:10 +00:00
HD Moore 98f83bbab1 Adds reg queryclass 
git-svn-id: file:///home/svn/framework3/trunk@8046 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-31 15:52:30 +00:00
HD Moore 68aafc8e13 Fixes #658 by adding a 250ms sleep to the dispatch of the close call. 
git-svn-id: file:///home/svn/framework3/trunk@7934 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-21 19:53:10 +00:00
Stephen Fewer be588716c5 Bug fix for meterpreter on NT4 (Tested on NT4.0 SP6). Add a function thread_open() in thread.c to wrap the use kernel32!OpenThread and ntdll!NtOpenThread for backwards compatibility. 
git-svn-id: file:///home/svn/framework3/trunk@7806 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-10 18:12:51 +00:00
HD Moore 6da0fda5ed Updated meterpreter binaries with a slight change to the thread schedule (solves a looping problem when the socket is dead). 
git-svn-id: file:///home/svn/framework3/trunk@7793 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-10 05:42:47 +00:00
HD Moore ff19b649f3 See #662. This should fix most of the meterpreter-side issues with sockets, there is still a second piece of this which is unflushed data on the local forwards from the ruby code. 
git-svn-id: file:///home/svn/framework3/trunk@7761 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-08 22:08:06 +00:00
HD Moore 792724c3f3 Cleanups to the socket code, its still not perfect, but much more usable now 
git-svn-id: file:///home/svn/framework3/trunk@7750 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-08 14:52:07 +00:00
Stephen Fewer 4f8cfc27d4 Replace the use of Critical Sections for locking with Mutex's (thread.c). This appears to resolve a deadlock issue with OpenSSL on some Windows systems. This commit resolves a bug in interactive processes where an interactive waiter thread will chew cpu due to a tight loop introduced by anonymous pipes not blocking (process.c). Dynamic lock creation for OpenSSL has been re-enabled should a future version of OpenSSL require it, AFAIK the current version used, v0.8.9, does not use dynamic lock creation (server_setup.c). Channels have been given locks to help synchronize concurrent access to a single channel. 
git-svn-id: file:///home/svn/framework3/trunk@7732 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-07 13:04:41 +00:00
HD Moore dfa0d155fc See #607. Switch sniffer code to use mutexes 
git-svn-id: file:///home/svn/framework3/trunk@7728 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-07 05:19:46 +00:00
Stephen Fewer a273c9f07c Initial commit of the multi-threaded meterpreter. 
git-svn-id: file:///home/svn/framework3/trunk@7698 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-04 17:37:21 +00:00
HD Moore e5e89906d0 Switch the meterpreter to SSLv3 and try to generate a slightly more realistic CN for the certificate. The goal is to work through a wider range of inline proxies. 
git-svn-id: file:///home/svn/framework3/trunk@7311 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-31 20:44:23 +00:00
HD Moore 5234fe8ff8 Fixes 416. Adds the rm/del commands to meterpreter, fixes build problems triggered by the POSIX code merge 
git-svn-id: file:///home/svn/framework3/trunk@7291 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-27 02:31:07 +00:00
HD Moore 276a3f8052 Use _WIN32 instead of __WIN32__ to be consistent 
git-svn-id: file:///home/svn/framework3/trunk@7290 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-27 01:13:35 +00:00
HD Moore 7d7c565a37 Merge in the POSIX stdapi extension, still some work left to finish 
git-svn-id: file:///home/svn/framework3/trunk@7266 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-26 04:34:20 +00:00
HD Moore bf5068f6b1 Fixes #288 and #320. This should fix the BSoD issue with the sniffer module (other than the mac filter change, this matches the vendor's example) and confirmed that the keyscan_dump fix works 
git-svn-id: file:///home/svn/framework3/trunk@7066 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-26 16:26:05 +00:00
et a89914d448 Finally screenshot capture. BMP at this time 
git-svn-id: file:///home/svn/framework3/trunk@7063 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-26 04:05:09 +00:00
Stephen Fewer 1937839e79 Patch meterpreter's sysinfo command to resolve the system language and architecture. 
git-svn-id: file:///home/svn/framework3/trunk@7028 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-10 13:09:48 +00:00
Stephen Fewer 36d60d5d12 Commit the x64 build of the meterpreter incognito extension. 
git-svn-id: file:///home/svn/framework3/trunk@7009 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-07 09:25:25 +00:00
Stephen Fewer ff9efacffa Commit the x64 build of the meterpreter priv extension. 
git-svn-id: file:///home/svn/framework3/trunk@7008 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-07 09:17:29 +00:00
Stephen Fewer 402608ec6f Commit the openssl x64 static libraries required for compilation. These are freshly built using the latest stable release (openssl-0.9.8k). Instructions for re-building the libraries also included. 
git-svn-id: file:///home/svn/framework3/trunk@7001 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-04 01:58:17 +00:00
Stephen Fewer 5dee5819b1 Commit the source code for the cross compilable reflective dll injection module. Some minor modifications to the stdapi extension were also required. All the projects (.vcproj) now have an x64 debug/release target as well as an x86 counterpart. 
git-svn-id: file:///home/svn/framework3/trunk@7000 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-04 01:53:58 +00:00
HD Moore 87ea275a17 Fixes #299 - corrects the win32 build environment and source to build properly again 
git-svn-id: file:///home/svn/framework3/trunk@6987 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-30 01:57:25 +00:00
HD Moore a811f28535 Patch from snfernandez to fix posix extension loading 
git-svn-id: file:///home/svn/framework3/trunk@6954 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-12 23:15:08 +00:00
HD Moore 41121f5870 Major merge of Meterpreter POSIX codebase from JR, Win32 projects may need a few more fixes to work properly 
git-svn-id: file:///home/svn/framework3/trunk@6949 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-10 02:02:16 +00:00
HD Moore d5ffcc1907 fix the posix build (patch from JR) 
git-svn-id: file:///home/svn/framework3/trunk@6945 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-09 17:28:44 +00:00
HD Moore 79df0ab405 Merge in JR's ulibc code 
git-svn-id: file:///home/svn/framework3/trunk@6944 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-09 02:27:52 +00:00
HD Moore da32f1bdea Updated meterpreter code/binaries to scrub memory after use, works around Peter's memoryze signatures from BH/DC 2009 
git-svn-id: file:///home/svn/framework3/trunk@6942 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-08 14:22:32 +00:00
HD Moore 9a1e07c4f3 First round of posix meterpreter commits from jr 
git-svn-id: file:///home/svn/framework3/trunk@6934 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-01 14:21:58 +00:00
HD Moore c173bff563 Updated reflective stuff to match the new hashing function 
git-svn-id: file:///home/svn/framework3/trunk@6923 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-31 17:57:51 +00:00
HD Moore 5577fac39e Closes #297. Switches to the dnet headers for the sniffer packet decodes 
git-svn-id: file:///home/svn/framework3/trunk@6822 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-17 19:39:31 +00:00
HD Moore 2c4acca92a Fixes #296. Removes polarssl references 
git-svn-id: file:///home/svn/framework3/trunk@6811 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-16 16:00:29 +00:00
HD Moore 975093efca Updated VC++ project files to fix the directory paths/includes for OpenSSL 
git-svn-id: file:///home/svn/framework3/trunk@6774 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-13 03:14:20 +00:00
HD Moore 148ca687f5 Updated libraries and source code now using OpenSSL 
git-svn-id: file:///home/svn/framework3/trunk@6773 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-13 03:10:39 +00:00
HD Moore 6b0974f618 Goodbye PolarSSL (your license stinks). 
git-svn-id: file:///home/svn/framework3/trunk@6772 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-13 03:03:53 +00:00
HD Moore e8784d68fb Fixes up the sniffer to handle large packet captures better, fixes a regression in the sysinfo command. 
git-svn-id: file:///home/svn/framework3/trunk@6768 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-12 13:17:37 +00:00
HD Moore f76d73a823 Free packet memory when the capture is stopped 
git-svn-id: file:///home/svn/framework3/trunk@6765 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-11 18:19:42 +00:00
HD Moore 4989f9bdbe Fixes a bug where if the sniffer SDK could not initialize, it would still be treated as initialized the next time it was checked. 
git-svn-id: file:///home/svn/framework3/trunk@6764 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-11 17:52:40 +00:00
HD Moore 645ca020e9 Fixes a memory corruption issue with the SSL file descriptor (was using a stack reference instead of the Remote->fd reference), adds the source code sans the Packet SDK for the sniffer module 
git-svn-id: file:///home/svn/framework3/trunk@6763 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-11 17:32:50 +00:00
HD Moore 608ca7aae8 This patch removes some of the meterpreter compiler warnings and fixes migration over SSL 
git-svn-id: file:///home/svn/framework3/trunk@6761 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-09 22:44:33 +00:00
HD Moore 7b516e06fe Transfer the migration payload over SSL, still working on a crash bug after migration completes 
git-svn-id: file:///home/svn/framework3/trunk@6756 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-09 03:22:10 +00:00
HD Moore 48e1e5f351 Merge Stephen Fewer's patches to enable support for Windows 7 (fixes support for NT and 2000 as well) 
git-svn-id: file:///home/svn/framework3/trunk@6744 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-05 20:24:37 +00:00
HD Moore 0ad96dd656 Adds a top-level SEH handler around the initialization stub, prevents a fatal error from preventing EXITFUNC from being called. 
git-svn-id: file:///home/svn/framework3/trunk@6722 4d416f70-5f16-0410-b530-b9f4589650da
 2009-06-27 19:39:10 +00:00
HD Moore 43372de9f0 Fix a bug in the new SSL code that broke large transfers 
git-svn-id: file:///home/svn/framework3/trunk@6720 4d416f70-5f16-0410-b530-b9f4589650da
 2009-06-27 01:52:36 +00:00
HD Moore aaff989294 Add the PolarSSL lib file and output directory to make building easier 
git-svn-id: file:///home/svn/framework3/trunk@6719 4d416f70-5f16-0410-b530-b9f4589650da
 2009-06-26 23:22:07 +00:00
HD Moore a74d3a3f38 Switches meterpreter to SSL by default, using the PolarSSL library. To build this, just place polarssl.lib into an workspace/common/Release/ 
git-svn-id: file:///home/svn/framework3/trunk@6718 4d416f70-5f16-0410-b530-b9f4589650da
 2009-06-26 23:18:53 +00:00
et 746a3c533a ext. sample dll. not ready for production enviroments 
git-svn-id: file:///home/svn/framework3/trunk@6506 4d416f70-5f16-0410-b530-b9f4589650da
 2009-04-29 03:38:42 +00:00
et 205a57da77 ext code and project adjustments 
git-svn-id: file:///home/svn/framework3/trunk@6500 4d416f70-5f16-0410-b530-b9f4589650da
 2009-04-27 04:34:28 +00:00
et 03d8541b3f espia early stages 
git-svn-id: file:///home/svn/framework3/trunk@6499 4d416f70-5f16-0410-b530-b9f4589650da
 2009-04-27 03:43:22 +00:00
HD Moore f059fbece7 Source code and VS project changes for cleaner build and new keyboard logging code 
git-svn-id: file:///home/svn/framework3/trunk@6374 4d416f70-5f16-0410-b530-b9f4589650da
 2009-03-23 05:26:11 +00:00
HD Moore ac7aa759cd Swapping in the latest patched copy of Meterpreter. See #275 
git-svn-id: file:///home/svn/framework3/trunk@6357 4d416f70-5f16-0410-b530-b9f4589650da
 2009-03-22 18:56:28 +00:00
HD Moore 07f59c2590 Swapping out old Meterpreter code for Stephen Fewer's latest patched copy 
git-svn-id: file:///home/svn/framework3/trunk@6356 4d416f70-5f16-0410-b530-b9f4589650da
 2009-03-22 18:55:36 +00:00
HD Moore d573c31be9 Remove the output directory from svn 
git-svn-id: file:///home/svn/framework3/trunk@5840 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-04 20:10:11 +00:00
Matt Miller d94bfaf373 better support for nx with dllinject payloads/meterp 
git-svn-id: file:///home/svn/framework3/trunk@5510 4d416f70-5f16-0410-b530-b9f4589650da
 2008-05-26 06:34:12 +00:00
Matt Miller e63a121341 merge incognito updates from Luke Jennings 
git-svn-id: file:///home/svn/framework3/trunk@5499 4d416f70-5f16-0410-b530-b9f4589650da
 2008-04-28 16:57:49 +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 48e3edc7c9 fix incorrect memset 
git-svn-id: file:///home/svn/framework3/trunk@4746 4d416f70-5f16-0410-b530-b9f4589650da
 2007-04-24 00:27:30 +00:00
Matt Miller c9b652fb50 correct memset in libloader 
git-svn-id: file:///home/svn/framework3/trunk@4725 4d416f70-5f16-0410-b530-b9f4589650da
 2007-04-21 20:21:52 +00:00
Matt Miller 9f691fbd58 fix DEP issue with meterp, fixes #48 
git-svn-id: file:///home/svn/framework3/trunk@4703 4d416f70-5f16-0410-b530-b9f4589650da
 2007-04-19 03:14:49 +00:00
Matt Miller a0a11e1fb3 proj file updates 
git-svn-id: file:///home/svn/framework3/trunk@4604 4d416f70-5f16-0410-b530-b9f4589650da
 2007-04-01 22:12:03 +00:00
Matt Miller 3b1a8f31c6 updated meterp stdapi to properly detect windows vista 
git-svn-id: file:///home/svn/framework3/trunk@4603 4d416f70-5f16-0410-b530-b9f4589650da
 2007-04-01 22:04:24 +00:00
Matt Miller 00ffcc3835 support for meterpreter scripts 
git-svn-id: file:///home/svn/framework3/trunk@3916 4d416f70-5f16-0410-b530-b9f4589650da
 2006-09-19 03:15:25 +00:00
HD Moore c4b93fb091 Changed READWRITE to EXECUTE_READWRITE to allow this to work with NX chips. It crashes LSASS in the current form. 
git-svn-id: file:///home/svn/framework3/trunk@3739 4d416f70-5f16-0410-b530-b9f4589650da
 2006-07-05 02:07:28 +00:00
Matt Miller 243127447b some meterp bugfixes found while creating a blog post :) 
git-svn-id: file:///home/svn/incoming/trunk@3592 4d416f70-5f16-0410-b530-b9f4589650da
 2006-04-07 03:02:37 +00:00
Matt Miller 9612409872 timestomp integration 
git-svn-id: file:///home/svn/incoming/trunk@3219 4d416f70-5f16-0410-b530-b9f4589650da
 2005-12-14 00:34:05 +00:00
Matt Miller e645a3f467 initial import of the priv esc extension 
git-svn-id: file:///home/svn/incoming/trunk@3209 4d416f70-5f16-0410-b530-b9f4589650da
 2005-12-13 05:59:59 +00:00
Matt Miller d9ac34db33 support for locking images in memory to prevent swap out 
git-svn-id: file:///home/svn/incoming/trunk@3208 4d416f70-5f16-0410-b530-b9f4589650da
 2005-12-13 04:09:12 +00:00
Matt Miller 954588ea9e support for RevertToSelf 
git-svn-id: file:///home/svn/incoming/trunk@3207 4d416f70-5f16-0410-b530-b9f4589650da
 2005-12-13 03:57:20 +00:00
Matt Miller 8eda56eb94 stuff 
git-svn-id: file:///home/svn/incoming/trunk@3182 4d416f70-5f16-0410-b530-b9f4589650da
 2005-12-06 19:22:36 +00:00
Matt Miller 9becfdf944 added a command, cleaned up some code 
git-svn-id: file:///home/svn/incoming/trunk@3179 4d416f70-5f16-0410-b530-b9f4589650da
 2005-12-06 03:56:29 +00:00
Matt Miller d8a6b6a913 remove bogus files 
git-svn-id: file:///home/svn/incoming/trunk@3178 4d416f70-5f16-0410-b530-b9f4589650da
 2005-12-06 03:40:07 +00:00
Matt Miller 50bb22277c updated workspace 
git-svn-id: file:///home/svn/incoming/trunk@3177 4d416f70-5f16-0410-b530-b9f4589650da
 2005-12-06 03:38:04 +00:00
Matt Miller d99e5b4f89 fix module dependency problem, made it so the server sock in meterp isn't inherited 
git-svn-id: file:///home/svn/incoming/trunk@2842 4d416f70-5f16-0410-b530-b9f4589650da
 2005-08-22 01:42:13 +00:00
Matt Miller 0a67ecab42 a few things I needed to commit 
git-svn-id: file:///home/svn/incoming/trunk@2839 4d416f70-5f16-0410-b530-b9f4589650da
 2005-08-12 14:45:54 +00:00
Matt Miller 9842cdc33b migration now enables the debug privilege first so it can migrate to system services, added reboot/shutdown wrappers 
git-svn-id: file:///home/svn/incoming/trunk@2834 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-26 04:52:59 +00:00
Matt Miller 539af94716 made ls prettier/faster 
git-svn-id: file:///home/svn/incoming/trunk@2821 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-23 17:52:29 +00:00
Matt Miller 005ecfab97 in-mem inject fixes 
git-svn-id: file:///home/svn/incoming/trunk@2819 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-22 04:29:01 +00:00
Spoon M 6488c4f72f fixed a bug, removed \r 
git-svn-id: file:///home/svn/incoming/trunk@2814 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-22 04:06:52 +00:00
Matt Miller 8e0efb818d removed extra stuff 
git-svn-id: file:///home/svn/incoming/trunk@2808 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-22 03:37:32 +00:00
Matt Miller 4220805855 workspac'in it 
git-svn-id: file:///home/svn/incoming/trunk@2807 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-22 03:34:52 +00:00
Spoon M c923be4817 hopefully support for in process exe without clobbering anything with the merge 
git-svn-id: file:///home/svn/incoming/trunk@2805 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-22 03:23:48 +00:00
Matt Miller 7fa9e887db foo 
git-svn-id: file:///home/svn/incoming/trunk@2803 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-22 02:55:55 +00:00
Matt Miller 7d8652e4e7 fixed line endings 
git-svn-id: file:///home/svn/incoming/trunk@2802 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-22 02:06:33 +00:00
Matt Miller 3758ae990b fixed line endings 
git-svn-id: file:///home/svn/incoming/trunk@2801 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-22 02:00:47 +00:00
Spoon M 1199a7a5a2 power and event logging features 
git-svn-id: file:///home/svn/incoming/trunk@2667 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-07 21:54:22 +00:00
Matt Miller 282635b111 import of meterp shit 
git-svn-id: file:///home/svn/incoming/trunk@2516 4d416f70-5f16-0410-b530-b9f4589650da
 2005-05-24 19:08:32 +00:00