12131 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Russell Bryant	b66c646519	Merged revisions 66026 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r66026 | russell | 2007-05-24 15:42:53 -0500 (Thu, 24 May 2007) | 3 lines Checking for the strip application needs to be done with AC_PATH_TOOL instead of AC_PATH_PROG to properly handle cross compilation environments. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66027 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 20:44:46 +00:00
Russell Bryant	a45cf4d0fb	add a note about using the intenal API for creating detached threads ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65991 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 19:11:09 +00:00
Russell Bryant	ccd22dc9e2	Merged revisions 65978 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65978 | russell | 2007-05-24 14:05:08 -0500 (Thu, 24 May 2007) | 3 lines Clear CFLAGS before running make for menuselect. (issue #9784, reported by ovi, patch by me) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65982 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 19:06:38 +00:00
Kevin P. Fleming	287bcc6127	Merged revisions 65965-65967 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65965 | kpfleming | 2007-05-24 14:24:55 -0400 (Thu, 24 May 2007) | 2 lines don't use uninitialized variables ........ r65966 | kpfleming | 2007-05-24 14:25:21 -0400 (Thu, 24 May 2007) | 2 lines don't reference GnuTLS headers and functions unless the configure script found it ........ r65967 | kpfleming | 2007-05-24 14:28:48 -0400 (Thu, 24 May 2007) | 2 lines oops, use #ifdef instead of #if ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65979 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 19:05:42 +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
Russell Bryant	bcd2bd8294	Make this build on *my* machine again, and hopefully not break others. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65964 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 18:07:56 +00:00
Dwayne M. Hubbard	585129cfea	Merged revisions 65866 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65866 | dhubbard | 2007-05-24 10:08:56 -0500 (Thu, 24 May 2007) | 1 line merged qwell's func_math patch for issue 9507 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65906 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 15:35:50 +00:00
Joshua Colp	22cf94111d	Merged revisions 65902 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65902 | file | 2007-05-24 11:27:23 -0400 (Thu, 24 May 2007) | 2 lines Add the ability to blacklist certain commands from being executed using the Command AMI action. (issue #9240 reported by junky) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65905 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 15:30:06 +00:00
Olle Johansson	b4f7d35240	Merged revisions 65901 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65901 | oej | 2007-05-24 17:26:10 +0200 (Thu, 24 May 2007) | 2 lines Issue 7672 - fix by zandbelt - Asterisk core dump since the GnuTLS interface did not support multithreading correctly. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65904 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 15:29:10 +00:00
Jason Parker	4aaa1d1ec1	Merged revisions 65877 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65877 | qwell | 2007-05-24 11:14:02 -0400 (Thu, 24 May 2007) | 4 lines Fix handling of zero-length frames when a codec is capable of native PLC. Issue 9183, patch by Mihai. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65903 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 15:28:29 +00:00
Olle Johansson	bd2ae8b587	Merged revisions 65892 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65892 | oej | 2007-05-24 17:20:54 +0200 (Thu, 24 May 2007) | 2 lines Issue 8193 - NAT issues with gtalk/STUN. Patch by phsultan. Thanks! ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65898 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 15:23:04 +00:00
Olle Johansson	45bb9430b9	Merged revisions 65857 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65857 | oej | 2007-05-24 17:05:10 +0200 (Thu, 24 May 2007) | 2 lines Issue 7686, fix by phsultan, NAT issues when calling from gtalk to SIP over nat. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65894 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 15:21:39 +00:00
Joshua Colp	e4191c375f	Merged revisions 65863 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65863 | file | 2007-05-24 11:08:17 -0400 (Thu, 24 May 2007) | 2 lines I like it when the RTP stack compiles myself... ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65869 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 15:10:13 +00:00
Russell Bryant	249376cfd4	Merged revisions 65853 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65853 | russell | 2007-05-24 10:04:14 -0500 (Thu, 24 May 2007) | 4 lines Ensure that frames are fully initialized. This will probably fix getting weird timestamp log messages in logs when using the Festival app. (issue #9781, patch by me) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65855 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 15:04:51 +00:00
Olle Johansson	d3c7be548d	Merged revisions 65841 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65841 | oej | 2007-05-24 16:48:55 +0200 (Thu, 24 May 2007) | 2 lines Issue #8536 - Caller ID not set in CDR for jingle ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65844 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 14:52:01 +00:00
Russell Bryant	89b0e6049a	Merged revisions 65842 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65842 | russell | 2007-05-24 09:49:05 -0500 (Thu, 24 May 2007) | 5 lines Fix the calculation of the RTT for RTCP. The previous code would result in oscillating and incorrect data. Additionally, the RTT would sometimes report negative values due to incorrect calculations. (issue #9601, patch from davetroy) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65843 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 14:50:25 +00:00
Joshua Colp	202fbe363a	Merged revisions 65839 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r65839 | file | 2007-05-24 10:42:12 -0400 (Thu, 24 May 2007) | 10 lines Merged revisions 65837 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r65837 | file | 2007-05-24 10:40:38 -0400 (Thu, 24 May 2007) | 2 lines Allow RFC2833 to be negotiated when an INVITE comes in without SDP and is not matched to a user or peer. (issue #9546 reported by mcrawford) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65840 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 14:43:49 +00:00
Olle Johansson	9b95428cce	Issue #8409 and accidentally a fix to chan_sip that wasn't supposed to be there ... but is still ok... Sorry. Lack of Tea, really. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65838 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 14:41:43 +00:00
Kevin P. Fleming	0ec502099f	Yes Virginia, there is a reason why we have stringfields in the sip_pvt structure... ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65814 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 11:38:20 +00:00
Christian Richter	e03f5a8e88	Merged revisions 65768 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r65768 | crichter | 2007-05-24 11:37:32 +0200 (Do, 24 Mai 2007) | 9 lines Merged revisions 65767 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r65767 | crichter | 2007-05-24 11:19:58 +0200 (Do, 24 Mai 2007) | 1 line we should only activate the generator in chan_misdn, when asterisk hask not yet taken the call (WAITING4DIGS state). Alerting audio will be generated fomr asterisk for example. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65769 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 09:51:01 +00:00
Russell Bryant	d1ba4f90de	- Remove debug variable that was only used in one place ... - convert string handling to the ast_str API - Convert strdup() to ast_strdup() and check the result - Minor formatting changes git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65749 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 03:28:39 +00:00
Tilghman Lesher	2263fd907e	Oops, should have released this when we were done with it. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65748 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 03:27:54 +00:00
Mark Spencer	04e45cfda3	Add SendURL support ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65731 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-24 02:23:08 +00:00
Kevin P. Fleming	48895d885d	Merged revisions 65685 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65685 | kpfleming | 2007-05-23 16:59:19 -0400 (Wed, 23 May 2007) | 2 lines start the delayed PBX when receive voice or video full frames as well, and comment this delayed-PBX activity ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65688 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-23 21:01:18 +00:00
Kevin P. Fleming	5dc23536ec	Merged revisions 65683 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r65683 | kpfleming | 2007-05-23 16:51:56 -0400 (Wed, 23 May 2007) | 10 lines Merged revisions 65682 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r65682 | kpfleming | 2007-05-23 16:46:22 -0400 (Wed, 23 May 2007) | 2 lines ensure that variables are set on a newly created channel before we start a PBX on it ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65684 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-23 20:53:10 +00:00
Kevin P. Fleming	04da47df24	Merged revisions 65679-65680 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65679 | kpfleming | 2007-05-23 16:30:24 -0400 (Wed, 23 May 2007) | 2 lines don't start a PBX on a new incoming IAX2 channel until we have some sort of response to our ACCEPT (ACK or anything else) ........ r65680 | kpfleming | 2007-05-23 16:35:50 -0400 (Wed, 23 May 2007) | 2 lines clear the 'delay PBX' flag when we are ready to start the PBX ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65681 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-23 20:39:42 +00:00
Kevin P. Fleming	61a53d859e	Merged revisions 65677 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r65677 | kpfleming | 2007-05-23 16:07:59 -0400 (Wed, 23 May 2007) | 10 lines Merged revisions 65676 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r65676 | kpfleming | 2007-05-23 16:06:13 -0400 (Wed, 23 May 2007) | 2 lines if we are going to set variables on a newly created channel, it should be done *before* we start the PBX on it ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65678 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-23 20:08:59 +00:00
Russell Bryant	33215616d4	Don't check for MWI event subscribers before creating the MWI event in voicemail. ... MWI events get cached, so go ahead and always generate them so the cache gets populated. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65659 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-23 17:17:45 +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
Joshua Colp	998261f602	Fix compiling of res_musiconhold under dev mode. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65590 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-23 13:07:28 +00:00
Russell Bryant	67b9dafe09	Fix a couple minor spelling mistakes. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65573 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-23 02:55:22 +00:00
Kevin P. Fleming	80baf2a40f	Merged revisions 65541 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65541 | kpfleming | 2007-05-22 16:25:41 -0400 (Tue, 22 May 2007) | 2 lines when building a version string for a developer branch, include the base branch in the version string ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65542 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-22 20:26:35 +00:00
Russell Bryant	90d6885701	Add a new feature for Music on Hold. If you set the "digit" option for a ... class in musiconhold.conf, a caller on hold may press this digit to switch to listening to that music class. This involved adding a new callback for generators, which allow generators to get notified of DTMF from the channel they are running on. Then, a callback was implemented for the music on hold generators. (patch from bbryant) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65505 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-22 18:52:59 +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
BJ Weschke	727e6c586a	Merged revisions 65408 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65408 | bweschke | 2007-05-22 10:02:56 -0400 (Tue, 22 May 2007) | 3 lines Fix a problem with flag recognition. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65455 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-22 15:25:28 +00:00
Joshua Colp	a3e603cd0f	Use ast_strlen_zero where possible. (issue #9774 reported by eliel) ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65454 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-22 15:08:08 +00:00
Joshua Colp	8517885be5	Blocked revisions 65452 via svnmerge ... ........ r65452 | file | 2007-05-22 11:04:46 -0400 (Tue, 22 May 2007) | 2 lines Remove a double const. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65453 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-22 15:05:43 +00:00
Joshua Colp	98398088bc	Make my compiler happy! Yay! ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65451 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-22 15:03:32 +00:00
Russell Bryant	c2ea9d8216	Blocked revisions 65394 via svnmerge ... ................ r65394 | russell | 2007-05-22 08:09:34 -0500 (Tue, 22 May 2007) | 12 lines Merged revisions 65389 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r65389 | russell | 2007-05-22 08:07:03 -0500 (Tue, 22 May 2007) | 4 lines Fix a memory leak that I just noticed in the device state handling in app_queue. On most device state changes, it would leak roughly 8 to 64 bytes (the length of the name of the device). ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65395 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-22 13:12:15 +00:00
Joshua Colp	5b4de10a12	Don't overwrite a pointer to the first channel... that is bad. (issue #9770 reported by tfbu) ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65376 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-22 12:58:38 +00:00
Russell Bryant	9b5d9279be	Fix a couple of spots in the handling of device states that could lead to a ... double free. (issue #9772, reported by Mike Anikienko, fix by me) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65375 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-22 12:52:03 +00:00
Christian Richter	47362f0906	Merged revisions 65342 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r65342 | crichter | 2007-05-22 10:12:20 +0200 (Di, 22 Mai 2007) | 9 lines Merged revisions 65328 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r65328 | crichter | 2007-05-22 09:46:39 +0200 (Di, 22 Mai 2007) | 1 line we stop the tones only when we're in the pre-call phase, otherwise e.g. when in CONNECTED state we should not stop tones when we receive an Information Message ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65343 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-22 08:21:59 +00:00
Tilghman Lesher	cff6586d8d	Fix for 64-bit platform ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65313 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-22 02:41:55 +00:00
Russell Bryant	ff73bfb7e7	I know we have talked about rewriting app_queue for Asterisk 1.6, but once I ... saw this, I couldn't help myself from changing it. Previously, for *every* device state change, app_queue would spawn a thread to handle it. Now, the device state callback just puts the state change in a queue and it gets handled by a single state change processing thread. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65298 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-21 06:56:21 +00:00
Tilghman Lesher	de27bce777	Comment a few more things, and remove an unnecessary db connection check ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65283 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-21 02:05:23 +00:00
Joshua Colp	cc3c91edc2	Merged revisions 65250 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65250 | file | 2007-05-20 13:59:58 -0400 (Sun, 20 May 2007) | 2 lines res_agi needs to export two symbols (ast_agi_register and ast_agi_unregister) for usage by others. (issue #9755 reported by mnicholson) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65253 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-20 18:01:05 +00:00
Joshua Colp	b10fd38770	Music on hold and crypto no longer need their symbols globally exported. They register the function pointers upon loading with their respective stubs. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65249 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-20 17:55:40 +00:00
Joshua Colp	3821954757	Clean up adsistub file a bit (just spacing) and change over the crypto sub to use this build_stub macro strategy. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65248 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-20 17:52:00 +00:00
Joshua Colp	42c63dd2ed	Add the adsistub file to the Asterisk makefile, fix a stub definition, and no longer make the symbols from res_adsi global since they don't need to be. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65233 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-05-20 14:48:31 +00:00