207 Commits

Author	SHA1	Message	Date
Olle Johansson	a1b9cbcd31	Implementation of a feature that will disable "missed calls" counters on SIP phones. ... If the call is answered by another phone, other phones won't display the call as "missed". You can also add an option to the dial command so that you can have a "followme" scenario and not count the calls as "missed" when you cancel the call. Thanks to Ramon and Frank for feedback on this feature. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74024 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-07-09 08:27:37 +00:00
Joshua Colp	92de3e5939	Merged revisions 73319 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r73319 | file | 2007-07-05 10:27:40 -0300 (Thu, 05 Jul 2007) | 10 lines Merged revisions 73318 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r73318 | file | 2007-07-05 10:26:02 -0300 (Thu, 05 Jul 2007) | 2 lines Actually check to make sure a PBX was started on one of the Local channels instead of blindly assuming it was. (issue #10112 reported by makoto) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73320 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-07-05 13:28:41 +00:00
Russell Bryant	055d82cbce	Add a massive set of changes for converting to use the ast_debug() macro. ... (issue #9957, patches from mvanbaak, caio1982, critch, and dimas) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69327 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-14 19:39:12 +00:00
Tilghman Lesher	9d05ff8ed5	Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67864 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-06 21:20:11 +00:00
Steve Murphy	a76ff39c0e	Merged revisions 64193 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r64193 | murf | 2007-05-14 07:58:42 -0600 (Mon, 14 May 2007) | 1 line As per 9570, worrisome CDR warnings have been removed, that are either not helpful, or not relevant. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64208 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-14 14:13:45 +00:00
Russell Bryant	3d409eb793	Update the device state functionality of chan_local such that it will return ... NOT_INUSE or INUSE when Local channels are in use as opposed to just UNKNOWN. It will still return INVALID if the extension doesn't exist at all. (issue #8048, patch from tim_ringenbach) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62673 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-02 15:46:49 +00:00
Steve Murphy	ecaf781933	Merged revisions 60989 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r60989 | murf | 2007-04-09 12:32:07 -0600 (Mon, 09 Apr 2007) | 1 line This is a big improvement over the current CDR fixes. It may still need refinement, but this won't have as many folks bothered. This also adds the mods from 1.4/r.61136; ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61152 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-04-10 05:41:34 +00:00
Tilghman Lesher	c6c64af72d	Merged revisions 60847 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r60847 | tilghman | 2007-04-08 21:42:48 -0500 (Sun, 08 Apr 2007) | 10 lines Merged revisions 60846 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r60846 | tilghman | 2007-04-08 21:37:18 -0500 (Sun, 08 Apr 2007) | 2 lines Bug 9505 - If the return value for local_queue_frame is set, then p->lock is no longer valid. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60848 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-04-09 02:44:37 +00:00
Joshua Colp	b3bc675402	Merged revisions 57318 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r57318 | file | 2007-03-01 17:21:44 -0500 (Thu, 01 Mar 2007) | 10 lines Merged revisions 57317 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r57317 | file | 2007-03-01 17:19:32 -0500 (Thu, 01 Mar 2007) | 2 lines Don't even attempt to optimize things when a proxy channel is involved. It will just explode in weird and unexplaineable ways. (issue #9175 reported by clegall_proformatique) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57319 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-03-01 22:23:26 +00:00
Russell Bryant	dcca8f345f	Merged revisions 51311 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51311 | russell | 2007-01-19 11:49:38 -0600 (Fri, 19 Jan 2007) | 23 lines Merge the changes from the /team/group/vldtmf_fixup branch. The main bug being addressed here is a problem introduced when two SIP channels using SIP INFO dtmf have their media directly bridged. So, when a DTMF END frame comes into Asterisk from an incoming INFO message, Asterisk would try to emulate a digit of some length by first sending a DTMF BEGIN frame and sending a DTMF END later timed off of incoming audio. However, since there was no audio coming in, the DTMF_END was never generated. This caused DTMF based features to no longer work. To fix this, the core now knows when a channel doesn't care about DTMF BEGIN frames (such as a SIP channel sending INFO dtmf). If this is the case, then Asterisk will not emulate a digit of some length, and will instead just pass through the single DTMF END event. Channel drivers also now get passed the length of the digit to their digit_end callback. This improves SIP INFO support even further by enabling us to put the real digit duration in the INFO message instead of a hard coded 250ms. Also, for an incoming INFO message, the duration is read from the frame and passed into the core instead of just getting ignored. (issue #8597, maybe others...) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51314 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-19 18:06:03 +00:00
Russell Bryant	ec8591d04c	Constify a bunch of usage strings for CLI commands. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48306 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-12-06 07:35:31 +00:00
Joshua Colp	f781673614	Merged revisions 47751 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r47751 | file | 2006-11-16 13:29:12 -0500 (Thu, 16 Nov 2006) | 10 lines Merged revisions 47750 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r47750 | file | 2006-11-16 13:26:50 -0500 (Thu, 16 Nov 2006) | 2 lines Because of the way chan_local is written we should be extra careful and make sure our callback functions have a tech_pvt. (issue #8275 reported by mflorell) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47752 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-11-16 18:32:27 +00:00
Joshua Colp	176c7ca47c	Merged revisions 47712 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r47712 | file | 2006-11-15 17:31:17 -0500 (Wed, 15 Nov 2006) | 10 lines Merged revisions 47711 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r47711 | file | 2006-11-15 17:29:30 -0500 (Wed, 15 Nov 2006) | 2 lines Make sure that the pvt structure exists before trying to do fixup on Local channels. (issue #7937 reported by mada123, fix by alamantia with mods by me) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47713 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-11-15 22:32:51 +00:00
Steve Murphy	908f176cf3	A fair number of changes for the sake of bug 7506 ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47290 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-11-07 21:47:49 +00:00
Joshua Colp	7659f6d524	Merged revisions 47287 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r47287 | file | 2006-11-07 15:14:58 -0500 (Tue, 07 Nov 2006) | 2 lines This is not the commit you are looking for... ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47288 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-11-07 20:16:02 +00:00
Joshua Colp	66d3792f11	Merged revisions 47284 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r47284 | file | 2006-11-07 15:08:52 -0500 (Tue, 07 Nov 2006) | 2 lines Make MOH work as it did before in chan_local, without this then it can go funky when transfers and MOH are involved. (issue #7671 reported by jmls) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47285 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-11-07 20:12:30 +00:00
Tilghman Lesher	10875731ec	Merged revisions 47051 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r47051 | tilghman | 2006-11-02 17:00:20 -0600 (Thu, 02 Nov 2006) | 2 lines Reverse change of "show" to "list" and make several other commands more consistent with "category verb arguments" ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47052 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-11-02 23:16:09 +00:00
Joshua Colp	36a9656234	Merged revisions 43697 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r43697 | file | 2006-09-26 16:19:33 -0400 (Tue, 26 Sep 2006) | 2 lines Strip options off the argument passed for devicestate in chan_local. (issue #8034 reported by pcardozo) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43698 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-09-26 20:20:34 +00:00
Tilghman Lesher	6ae8741518	Lots more removal of deprecated things ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43452 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-09-21 21:59:12 +00:00
Kevin P. Fleming	fcb999c01c	merge qwell's CLI verbification work ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43212 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-09-18 19:54:18 +00:00
Joshua Colp	082f59ff03	Use flags instead of variables on the private structure for things ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42338 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-09-07 21:11:07 +00:00
Joshua Colp	0b93665a71	Code cleaning/updates/potential bug fixes ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42311 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-09-07 19:50:59 +00:00
Joshua Colp	c6977b9983	Merge in VLDTMF support with Zaptel/Core done by the ever great Darumkilla Russell Bryant and the RTP portion done by myself, Muffinlicious Joshua Colp. This has gone through so many discussions/revisions it's not funny but we finally have it! ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41507 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-08-31 01:59:02 +00:00
Russell Bryant	f7e7161607	Merge team/russell/frame_caching ... There are some situations in Asterisk where ast_frame and/or iax_frame structures are rapidly allocatted and freed (at least 50 times per second for one call). This code significantly improves the performance of ast_frame_header_new(), ast_frdup(), ast_frfree(), iax_frame_new(), and iax_frame_free() by keeping a thread-local cache of these structures and using frames from the cache whenever possible instead of calling malloc/free every time. This commit also converts the ast_frame and iax_frame structures to use the linked list macros. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41278 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-08-29 20:50:36 +00:00
Kevin P. Fleming	0a27d8bfe5	merge new_loader_completion branch, including (at least): ... - restructured build tree and makefiles to eliminate recursion problems - support for embedded modules - support for static builds - simpler cross-compilation support - simpler module/loader interface (no exported symbols) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-08-21 02:11:39 +00:00
BJ Weschke	35a2f14d96	Quit early and print a LOG_WARNING if we are trying to check devicestate on a Local channel that's been improperly defined. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34463 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-06-16 12:55:18 +00:00
Kevin P. Fleming	794d0e4d1f	make Local channel return sensible device state values ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34162 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-06-14 22:39:19 +00:00
Kevin P. Fleming	79f5f61474	Merged revisions 33638 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r33638 | kpfleming | 2006-06-12 11:03:29 -0500 (Mon, 12 Jun 2006) | 2 lines only allow chan_local to masquerade the outbound channel onto its owner, instead of the other way around (this will ensure that group variables on the outbound channel as preserved) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33643 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-06-12 16:07:32 +00:00
Kevin P. Fleming	472c1ca282	simplify autoconfig include mechanism (make tholo happy he can use lint again :-) ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32846 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-06-07 18:54:56 +00:00
Joshua Colp	a0f95cd526	Merged revisions 29464 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r29464 | file | 2006-05-22 13:33:03 -0300 (Mon, 22 May 2006) | 2 lines Preserve presentation bit when going through chan_local (issue #7002 reported by acunningham) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@29466 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-05-22 16:36:13 +00:00
Olle Johansson	1783cb3a91	Adding send_text capability to chan_local ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@28520 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-05-19 08:20:01 +00:00
Olle Johansson	908c153840	First stab at supporting video in chan_local ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@28502 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-05-19 08:03:28 +00:00
Olle Johansson	a3cc752008	Add simple devicestate for chan_local ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@28484 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-05-19 07:56:56 +00:00
Kevin P. Fleming	fdcfd6469b	ensure that control frames with payload can be sent to channel drivers via ->indicate() ... update iax2_indicate to pass control frame payload to the connected channel add an API call for sending an indication with payload, and use it for control frames with payload git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@26417 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-05-10 12:24:11 +00:00
Luigi Rizzo	5928df2a48	replace strncpy with ast_copy_string. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22016 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-04-21 17:53:39 +00:00
Luigi Rizzo	e43bc6634d	This rather large commit changes the way modules are loaded. ... As partly documented in loader.c and include/asterisk/module.h, modules are now expected to return all of their methods and flags into a structure 'mod_data', and are normally loaded with RTLD_NOW | RTLD_LOCAL, so symbols are resolved immediately and conflicts should be less likely. Only in a small number of cases (res_*, typically) modules are loaded RTLD_GLOBAL, so they can export symbols. The core of the change is only the two files loader.c and include/asterisk/module.h, all the rest is simply adaptation of the existing modules to the new API, a rather mechanical (but believe me, time and finger-consuming!) process whose detail you can figure out by svn diff'ing any single module. Expect some minor compilation issue after this change, please report it on mantis http://bugs.digium.com/view.php?id=6968 so we collect all the feedback in one place. I am just sorry that this change missed SVN version number 20000! git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20003 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-04-14 14:08:19 +00:00
Kevin P. Fleming	f10f427d49	since the module API is changing, it's a good time to const-ify the description() and key() return values ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18552 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-04-08 22:01:19 +00:00
Tilghman Lesher	756c7cbb12	Bug 6873 - Finish moving from the non-threadsafe (and poor randomness) rand() to threadsafe ast_random() ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@17627 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-04-05 17:44:44 +00:00
Luigi Rizzo	0b655c3ce9	minor cleanup: localize a variable and replace i++; i++ with i +=2; ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@16652 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-03-31 10:13:22 +00:00
Tilghman Lesher	4f1e5d1aef	Bug 6387 - janitor cleanup for linked lists ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9349 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-02-10 00:20:43 +00:00
BJ Weschke	81125d803e	Don't set a global variable if the channel you're trying to set CHANLOCALSTATUS on has gone away already. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9139 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-02-03 22:38:38 +00:00
Kevin P. Fleming	a16ae226b6	use string fields for some stuff in ast_channel ... const-ify some more APIs remove 'type' field from ast_channel, in favor of the one in the channel's tech structure allow string field module users to specify the 'chunk size' for pool allocations update chan_alsa to be compatible with recent const-ification patches git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9060 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-02-01 23:05:28 +00:00
Russell Bryant	a228af1dd9	remove some more local declarations of null frames ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9004 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-01-31 17:57:12 +00:00
Olle Johansson	ad5eaa9aca	More doxygen updates ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8315 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-01-20 00:18:42 +00:00
BJ Weschke	242a478023	Fix compiler warning. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8135 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-01-17 18:31:03 +00:00
BJ Weschke	1874f21ff8	Implement the autologoffunavail option in chan_agent (#6038 with some minor mods) ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8063 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-01-13 18:23:30 +00:00
Russell Bryant	466a062b09	convert some channels to use the memory allocation wrappers. ... (This is being added to the janitor projects list.) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7954 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2006-01-11 01:20:29 +00:00
Russell Bryant	a725468381	update doxygen docs to specify authors ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7682 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2005-12-30 21:18:06 +00:00
Kevin P. Fleming	0242a69b3f	Merged revisions 7265-7266,7268-7275 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r7265 | oej | 2005-12-01 17:18:14 -0600 (Thu, 01 Dec 2005) | 2 lines Changing bug report address to the Asterisk issue tracker ........ r7266 | kpfleming | 2005-12-01 17:18:29 -0600 (Thu, 01 Dec 2005) | 3 lines Makefile 'update' target now supports updating from Subversion repositories (issue #5875) remove support for 'patches' subdirectory, it's no longer useful ........ r7268 | kpfleming | 2005-12-01 17:34:58 -0600 (Thu, 01 Dec 2005) | 2 lines ensure channel's scheduling context is freed (issue #5788) ........ r7269 | kpfleming | 2005-12-01 17:49:44 -0600 (Thu, 01 Dec 2005) | 2 lines don't block waiting for the Festival server forever when it goes away (issue #5882) ........ r7270 | kpfleming | 2005-12-01 18:26:12 -0600 (Thu, 01 Dec 2005) | 2 lines allow variables to exist on both 'halves' of the Local channel (issue #5810) ........ r7271 | kpfleming | 2005-12-01 18:28:48 -0600 (Thu, 01 Dec 2005) | 2 lines protect agent_bridgedchannel() from segfaulting when there is no bridged channel (issue #5879) ........ r7272 | kpfleming | 2005-12-01 18:39:00 -0600 (Thu, 01 Dec 2005) | 3 lines properly handle password changes when mailbox is last line of config file and not followed by a newline (issue #5870) reformat password changing code to conform to coding guidelines (issue #5870) ........ r7273 | kpfleming | 2005-12-01 18:42:40 -0600 (Thu, 01 Dec 2005) | 2 lines allow previous context-searching behavior to be used if desired (issue #5899) ........ r7274 | kpfleming | 2005-12-01 18:51:15 -0600 (Thu, 01 Dec 2005) | 2 lines inherit channel variables into channels created by Page() application (issue #5888) ........ r7275 | oej | 2005-12-01 18:52:13 -0600 (Thu, 01 Dec 2005) | 2 lines Bug #5907. Improve SIP INFO DTMF debugging output. (1.2 & Trunk) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7276 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2005-12-02 01:01:11 +00:00
Kevin P. Fleming	2c65582b66	remove extraneous svn:executable properties ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7221 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2005-11-29 18:24:39 +00:00