759 commits

Author	SHA1	Message	Date
Tilghman Lesher	81bc1d7af5	Merge in ast_strftime branch, which changes timestamps to be accurate to the microsecond, instead of only to the second ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75706 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-07-18 19:47:20 +00:00
Russell Bryant	432a087ed9	Merged revisions 75053 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r75053 | russell | 2007-07-13 14:11:26 -0500 (Fri, 13 Jul 2007) | 20 lines Merged revisions 75052 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r75052 | russell | 2007-07-13 14:10:00 -0500 (Fri, 13 Jul 2007) | 12 lines (closes issue #9660) Reported by: mmacvicar Patches submitted by: bbryant, russell Tested by: mmacvicar, marco, arcivanov, jmhunter, explidous When using a TDM400P (and probably other analog cards) there was a chance that you could hang up and pick the phone back up where it has been long enough to be not considered a flash hook, but too soon such that the device reports that it is busy and the person on the phone will only hear silence. This patch makes chan_zap more tolerant of this and gives the device a couple of seconds to succeed so the person on the phone happily gets their dialtone. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75054 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-07-13 19:19:51 +00:00
Jason Parker	d61b0cac84	Merged revisions 74159 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 Closes issue #9186 ................ r74159 | qwell | 2007-07-09 15:19:28 -0500 (Mon, 09 Jul 2007) | 16 lines Merged revisions 74158 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r74158 | qwell | 2007-07-09 15:18:15 -0500 (Mon, 09 Jul 2007) | 8 lines Several chan_zap options were not working on reload because they were arbitrarily disallowed when reloading some/most PRI options (such as signalling) was disallowed. Options such as polarityonanswerdelay and answeronpolarityswitch can safely be changed on a reload. This corrects that behavior. Issue 9186, patch by tzafrir. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74160 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-07-09 20:21:13 +00:00
Matthew Fredrickson	da124685f3	Fix bug where point code gets corrupted on CPG ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72437 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-28 16:35:38 +00:00
Matthew Fredrickson	7f233a8dc2	Let's NOT create a deadlock scenario here ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72304 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 21:44:13 +00:00
Kevin P. Fleming	86fcb89338	Merged revisions 72205 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r72205 | kpfleming | 2007-06-27 14:13:21 -0500 (Wed, 27 Jun 2007) | 2 lines use the proper type for storing group number bits so that if someone specifies 'group=42' it will actually work instead of being silently ignored ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72207 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 19:13:54 +00:00
Matthew Fredrickson	8da2de3a6c	Remove deprecated function call ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70769 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-21 18:03:46 +00:00
Russell Bryant	a89e4c5083	Merged revisions 70397 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r70397 | russell | 2007-06-20 13:46:49 -0500 (Wed, 20 Jun 2007) | 13 lines Merged revisions 70396 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r70396 | russell | 2007-06-20 13:45:38 -0500 (Wed, 20 Jun 2007) | 5 lines Fix a problem where an established call would not be properly disconnected when a PRI disconnect is received depending on which cause code was received. (issue #9588, original patch by softins, updated patch from jtexter3, and some additional feedback from mhardeman) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70398 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-20 18:48:34 +00:00
Olle Johansson	3aafb233f2	Show TDD status in "zap show channels" ... Inspired by work at Omnitor in Sweden git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70310 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-20 14:33:34 +00:00
Steve Murphy	c6ed12405f	These changes were submitted via bug 6683, to allow CID detection in India, with carriers that do Polarity/DTMF CID signalling. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70001 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-19 17:07:28 +00:00
Matthew Fredrickson	f408a5405a	Add support for setting nature of address, presentation, and other related SS7 number options (#10000) ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69943 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-19 15:14:23 +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
Matthew Fredrickson	60b029aa82	Clean up debug messages a little bit for ss7 linkset debugging ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69308 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-14 16:41:57 +00:00
Russell Bryant	d2a78872cc	Fix a couple of places that got missed in the conversion to using the new API ... call for creating detached threads. (issue #9915, reported by elguro, fixed by me) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68325 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-07 22:38:59 +00:00
Matthew Fredrickson	46e054c1af	Allow overlapdialing directions to be configurable. Bug #8554 ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67920 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-06 23:12:58 +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
Joshua Colp	ca529e58e6	When SS7 is enabled add w/SS7 to the end. (issue #9893 reported by Mike Anikienko) ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67596 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-06 12:23:59 +00:00
Russell Bryant	d8fa6b0312	Merged revisions 67457 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r67457 | russell | 2007-06-05 14:48:02 -0500 (Tue, 05 Jun 2007) | 2 lines Suppress a bunch of debug output unless option_debug is on ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67458 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-05 19:50:04 +00:00
Russell Bryant	bbd0541f98	Improve the way that the zaptel channel name is created by using the Asterisk ... strings API and by only allocating space on the stack git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67380 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-05 17:11:32 +00:00
Joshua Colp	c103a8d298	This concludes my tweaking of things. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66604 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-30 16:11:57 +00:00
Russell Bryant	4b3a3fb14c	Add a new API call for creating detached threads. Then, go replace all of the ... places in the code where the same block of code for creating detached threads was replicated. (patch from bbryant) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65968 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 18:30:19 +00:00
Matthew Fredrickson	cc016de696	Make sure we get the cause code in the REL ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65640 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-23 15:37:51 +00:00
Russell Bryant	5558323d0c	Merged revisions 65589 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r65589 | russell | 2007-05-23 08:07:13 -0500 (Wed, 23 May 2007) | 11 lines Merged revisions 65588 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r65588 | russell | 2007-05-23 08:06:17 -0500 (Wed, 23 May 2007) | 3 lines Revert revision 62417 as someone reported problems with it to Mark. This was related to issue #9588. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65591 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-23 13:10:28 +00:00
Russell Bryant	d3ee017682	Merged revisions 65501 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65501 | russell | 2007-05-22 13:40:38 -0500 (Tue, 22 May 2007) | 3 lines List res_smdi as a dependency for app_voicemail and chan_zap (Thanks to mnicholson for pointing it out) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65502 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-22 18:41:56 +00:00
Matthew Fredrickson	9b5454232c	XXX-XXX-XXX appears to be the standard ANSI pointcode format ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64455 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-15 20:45:20 +00:00
Matthew Fredrickson	79f553a4ab	Only print the SS7 UP once. Not every time we get the test messages on the ... line. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64384 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-14 22:25:56 +00:00
Matthew Fredrickson	e2ca869abd	Merged revisions 63654 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r63654 | mattf | 2007-05-09 12:25:21 -0500 (Wed, 09 May 2007) | 10 lines Merged revisions 63653 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r63653 | mattf | 2007-05-09 12:20:20 -0500 (Wed, 09 May 2007) | 2 lines Make sure we only create a DSP if it's requested on SUB_REAL ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63655 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-09 17:35:54 +00:00
Steve Murphy	fe7068a51b	Merged revisions 62689 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r62689 | murf | 2007-05-02 11:10:50 -0600 (Wed, 02 May 2007) | 1 line a)In chan_zap, set the clid, src fields in channel_alloc call. b)in the channel_alloc func, set the cid_num and name fields from the arglist[blush]. c) don't update the channel app & app data fields if you are in the 'h' extension. d)the load_module func in cdr_radius needs to return DECLINE, SUCCESS. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62690 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-02 17:24:03 +00:00
Russell Bryant	a91f9b138d	Merged revisions 62419 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r62419 | russell | 2007-04-30 10:58:28 -0500 (Mon, 30 Apr 2007) | 12 lines Merged revisions 62417 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r62417 | russell | 2007-04-30 10:57:26 -0500 (Mon, 30 Apr 2007) | 4 lines This patch fixes an issue where depending on the cause code, when the network sends a PRI disconnect, the call may not be properly hung up. (issue #9588, reported and patched by softins) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62422 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-04-30 15:59:27 +00:00
Russell Bryant	0efe511879	Merged revisions 62331 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r62331 | russell | 2007-04-29 00:50:37 -0500 (Sun, 29 Apr 2007) | 3 lines Fix a bug that made the "language" setting in zapata.conf not functional. (issue #9626, reported and fixed by sergee) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62332 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-04-29 05:51:18 +00:00
Russell Bryant	b6b1bf3213	Merge changes from team/russell/events ... This set of changes introduces a new generic event API for use within Asterisk. I am still working on a way for events to be shared between servers, but this part is ready and can already be used inside of Asterisk. This set of changes introduces the first use of the API, as well. I have restructured the way that MWI (message waiting indication) is handled. It is now event based instead of polling based. For example, if there are a bunch of SIP phones subscribed to mailboxes, then chan_sip will not have to constantly poll the mailboxes for changes. app_voicemail will generate events when changes occur. See UPGRADE.txt and CHANGES for some more information on the effects of these changes from the user perspective. For developer information, see the text in include/asterisk/event.h. As always, additional feedback is welcome on the asterisk-dev mailing list. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62292 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-04-28 21:01:44 +00:00
Kevin P. Fleming	ee95074173	Merged revisions 61914 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r61914 | kpfleming | 2007-04-25 17:29:53 -0500 (Wed, 25 Apr 2007) | 10 lines Merged revisions 61913 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r61913 | kpfleming | 2007-04-25 17:24:59 -0500 (Wed, 25 Apr 2007) | 2 lines handle a very bizarre race condition with channels being redirected before a simple switch can be started on them (issue #9286) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61915 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-04-25 22:34:58 +00:00
Russell Bryant	f5d4a16cda	Merged revisions 61799 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r61799 | russell | 2007-04-25 11:22:07 -0500 (Wed, 25 Apr 2007) | 11 lines Merged revisions 61798 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r61798 | russell | 2007-04-25 11:20:38 -0500 (Wed, 25 Apr 2007) | 3 lines Fix a typo where cid_num got copied instead of cid_ani. (issue #9587, reported and patched by xrg) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61800 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-04-25 16:23:00 +00:00
Dwayne M. Hubbard	f3ab33014a	removed #if 0 block from chan_zap restart_monitor() ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61784 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-04-24 19:08:28 +00:00
Doug Bailey	7c9e46507b	Added zapata.conf parameter "cid_rxgain" to allow the user to adjust the gain bump used during CID acquisition. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61303 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-04-10 22:02:53 +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
Matthew Fredrickson	bc0310e94e	Merged revisions 60485 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r60485 | mattf | 2007-04-06 13:21:52 -0500 (Fri, 06 Apr 2007) | 2 lines Make sure we check the faxdetect option before doing fax processing ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60487 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-04-06 18:26:24 +00:00
Matthew Fredrickson	1031bbba01	Merged revisions 60459 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r60459 | mattf | 2007-04-06 12:32:31 -0500 (Fri, 06 Apr 2007) | 10 lines Merged revisions 60456 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r60456 | mattf | 2007-04-06 12:03:15 -0500 (Fri, 06 Apr 2007) | 2 lines There should only be one code path for doing DTMF conditionals on channels. This fixes it. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60486 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-04-06 18:25:38 +00:00
Matthew Fredrickson	d6e7b047f0	Update to support multiple CIC groups and DPCs per linkset. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59555 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-03-30 20:54:42 +00:00
Dwayne M. Hubbard	6626c31f35	added filtering options to 'zap show channels' to implement functionality described in issue 6520 ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59286 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-03-28 00:09:25 +00:00
Joshua Colp	04f1955781	Use better english. Renegotiate! Repeat after me: renegotiate. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59272 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-03-27 20:11:11 +00:00
Matthew Fredrickson	e4a7d1b35f	Fix bug in which parameter type we are passing. This shouldn't be a problem ... since both types are the same underneath. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59205 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-03-26 16:48:29 +00:00
Matthew Fredrickson	df42d78569	Small API related SS7 updates. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59204 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-03-26 16:46:07 +00:00
Russell Bryant	d04a9e0bc0	Merged revisions 58510 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r58510 | russell | 2007-03-08 16:06:54 -0600 (Thu, 08 Mar 2007) | 3 lines Add a missing break statement so that handling the above event does not incorrectly destroy the channel. (issue #9242, andrew) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58511 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-03-08 22:08:28 +00:00
Russell Bryant	9266a6b8d8	Merged revisions 58320 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r58320 | russell | 2007-03-07 19:01:46 -0600 (Wed, 07 Mar 2007) | 6 lines If we receive ZT_EVENT_REMOVED, destroy the specified channel. (issue #7256, tzafrir) Also, update the configure script to make sure that we don't try to build chan_zap if the installed version of zaptel does not include ZT_EVENT_REMOVED. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58321 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-03-08 01:06:00 +00:00
Joshua Colp	b7e47198da	Add zap show version CLI command. This pulls the version/echo canceller in use directly using the ZT_GETVERSION ioctl. (issue #9094 reported by tootai) ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57943 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-03-05 20:13:51 +00:00
Tilghman Lesher	a3da18c244	Issue 7789 - some telcos want the TON set based on the number, but without the NANP prefix removed ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56952 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-02-27 00:11:32 +00:00
Olle Johansson	e916cf45da	Doxygen updates and corrections ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56648 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-02-24 19:49:11 +00:00
Matthew Fredrickson	daa5f504ec	Merged revisions 54375 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r54375 | mattf | 2007-02-14 10:56:40 -0600 (Wed, 14 Feb 2007) | 10 lines Merged revisions 54373 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r54373 | mattf | 2007-02-14 10:25:49 -0600 (Wed, 14 Feb 2007) | 2 lines When handling glare on a PRI, move the requested channel rather than hang up the old one. Fix for 8957 and 9011. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54404 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-02-14 17:14:42 +00:00
Russell Bryant	b233892198	Merged revisions 53046 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r53046 | russell | 2007-01-31 15:32:08 -0600 (Wed, 31 Jan 2007) | 11 lines Merged revisions 53045 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r53045 | russell | 2007-01-31 15:25:11 -0600 (Wed, 31 Jan 2007) | 3 lines Fix a bunch of places where pthread_attr_init() was called, but pthread_attr_destroy() was not. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53047 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-01-31 21:35:15 +00:00