15035 Commits (8b31f34e7844c35bc508c9bf31c404de485249a4)

 

All Branches   

Search

Author	SHA1	Message	Date
Jason Parker	8b31f34e78	Merged revisions 111658 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r111658 | qwell | 2008-03-28 11:19:56 -0500 (Fri, 28 Mar 2008) | 8 lines The file size of WAV49 does not need to be an even number. (closes issue #12128) Reported by: mdu113 Patches: 12128-noevenlength.diff uploaded by qwell (license 4) Tested by: qwell, mdu113 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111659 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Tilghman Lesher	3f78a375a0	Merged revisions 111605 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r111605 | tilghman | 2008-03-28 09:35:45 -0500 (Fri, 28 Mar 2008) | 3 lines Update debugging text, since Valgrind eliminated the --log-file-exactly option. (Closes issue #12320) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111606 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Joshua Colp	cafce80cd5	Forgetting to unregister a manager action is bad, mmmk? ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111565 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Mark Michelson	0f8f6e239e	Fix a crash that would happen when attempting to unload the app_queue module. ... The problem was that when the refcount on the queue hit 0, the destructor was called, and inside the destructor, another function was called which would increase the refcount back to 1 again and then decrease it again back to 0 for every member in the queue. This meant that the destructor was being recursively called, leading to a double free of the queue. This is now fixed by making sure to unlink the queue from the queues container prior to the final unref of the queue. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111533 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Terry Wilson	2848068017	Fix another little http problem. In making it match coding guidelines, a comparison was dropped ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111500 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Steve Murphy	3d4cb09ae8	comment cleanup and iron out a really dumb mistake in handling the '.'-wildcard in the new exten pattern matcher. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111497 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Tilghman Lesher	42358325a8	Merged revisions 111442 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r111442 | tilghman | 2008-03-27 14:23:12 -0500 (Thu, 27 Mar 2008) | 6 lines For FreeBSD, at least, the ifa_addr element could be NULL. (closes issue #12300) Reported by: festr Patches: acl.c.patch uploaded by festr (license 443) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111443 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Steve Murphy	6928ccfa02	Merged revisions 111391 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r111391 | murf | 2008-03-27 07:03:28 -0600 (Thu, 27 Mar 2008) | 9 lines These small documentation updates made in response to a query in asterisk-users, where a user was using Playback, but needed the features of Background, and had no idea that Background existed, or that it might provide the features he needed. I thought the best way to avert these kinds of queries was to provide "See Also" references in all three of "Background", "Playback", "WaitExten". Perhaps a project to do this with all related apps is in order. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111410 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Steve Murphy	2427603eaf	Merged revisions 111341 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r111341 | murf | 2008-03-26 21:21:05 -0600 (Wed, 26 Mar 2008) | 15 lines (closes issue #12302) Reported by: pj Tested by: murf These changes will set a channel variable ~~EXTEN~~ just before generating code for a switch, with the value of ${EXTEN}. The exten is marked as having a switch, and ever after that, till the end of the exten, we substitute any ${EXTEN} with ${~~EXTEN~~} instead in application arguments; (and the ${EXTEN: also). The reason for this, is that because switches are coded using separate extensions to provide pattern matching, and jumping to/from these switch extensions messes up the ${EXTEN} value, which blows the minds of users. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111360 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Jason Parker	8f2ae67a3e	But we can change the API here. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111295 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Jason Parker	0271088279	Merged revisions 111280 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r111280 | qwell | 2008-03-26 19:25:13 -0500 (Wed, 26 Mar 2008) | 1 line Put this flag back so we don't change the API. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111285 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Jason Parker	f59c496a81	Merged revisions 111245 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r111245 | qwell | 2008-03-26 18:26:33 -0500 (Wed, 26 Mar 2008) | 9 lines Remove excessive smoother optimization that was causing audio glitches (small "pops") after (about 200ms later) an "incorrectly" sized frame was received. While it would be very nice to keep this as optimized as possible, it makes no sense for the smoother to be dropping random bits of audio like this. Isn't that the whole point of a smoother? Closes issue #12093. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111246 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Terry Wilson	4c2531989a	Stupid strcasecmp function :-) ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111213 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Tilghman Lesher	bdf4443586	Oops, missed one ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111185 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Tilghman Lesher	e04025ead9	Simplify new macro, simplify configfile logic, now that list is sorted ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111132 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Joshua Colp	352ca6584b	Merged revisions 111129 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r111129 | file | 2008-03-26 16:55:08 -0300 (Wed, 26 Mar 2008) | 6 lines Update autosupport script. (closes issue #12310) Reported by: angler Patches: autosupport.diff uploaded by angler (license 106) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111130 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Kevin P. Fleming	769abc6053	Merged revisions 111126 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r111126 | kpfleming | 2008-03-26 14:51:24 -0500 (Wed, 26 Mar 2008) | 10 lines Merged revisions 111125 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r111125 | kpfleming | 2008-03-26 14:49:30 -0500 (Wed, 26 Mar 2008) | 2 lines update UPGRADE notes to document usage of the script ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111127 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Mark Michelson	e94d06b83c	Merged revisions 111121 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r111121 | mmichelson | 2008-03-26 14:37:36 -0500 (Wed, 26 Mar 2008) | 4 lines This code change is made just for clarification. It does exactly the same thing as before. It just doesn't look as wrong. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111123 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Joshua Colp	438361c0b8	Add expiry value to the sip show subscriptions CLI command. ... (closes issue #12025) Reported by: agx git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111083 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Mark Michelson	5278d1d62b	Merged revisions 111049 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r111049 | mmichelson | 2008-03-26 14:22:16 -0500 (Wed, 26 Mar 2008) | 9 lines Add a lock to the vm_state structure and use the lock around mail_open calls to prevent concurrent access of the same mailstream. This, along with trunk's ability to configure TCP timeouts for IMAP storage will help to prevent crashes and hangs when using voicemail with IMAP storage. (closes issue #10487) Reported by: ewilhelmsen ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111067 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Tilghman Lesher	e6fc9ae52c	Add a linkedlist macro that maintains a sorted list ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111036 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Jason Parker	dd2700d0b1	Only try to detect silence when we actually need to, instead of...always. ... If this is wrong, I'd love to hear why. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111028 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Kevin P. Fleming	13d8451459	Merged revisions 111024 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r111024 | kpfleming | 2008-03-26 14:06:56 -0500 (Wed, 26 Mar 2008) | 10 lines Merged revisions 111019 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r111019 | kpfleming | 2008-03-26 13:58:37 -0500 (Wed, 26 Mar 2008) | 2 lines add a script to make getting the iLBC source code simple for end users ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111025 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Jason Parker	6412a96e43	Large cleanup of DSP code ... Per comments from dimas: 1. The code now generates DTMF_BEGIN frames in addition to DTMF_END ones. 2. "quelching" rewritten - now each detector (MF/DTMF/generic tone) may mark fragment of a frame for suppression (squelching, muting) with a call to mute_fragment. Actual muting happens only once at the very end of ast_dsp_process where all marked fragments are zeroed. This way every detector sees original data in the frame without any piece of a frame being zeroed by a detector which was run before. 3. DTMF detector tries to "mute" one block before and one block after the block where actual tone was detected. Muting of previois block is something new for this patch. Obviously this operation is not always possible - if current frame does not contain data for previous block - it is too late. But at least we make our best. Muting of next block was already done by the old code but it only affects part of the next block which is in the frame being processed. New code keeps this information in state structures so it will mute proper number of samples in the next frame(s) too. 4. Removed ast_dsp_digitdetect and ast_dsp_getdigits APIs because these are not used. 5. DSP API extended a bit - ast_dsp_was_muted() function added which returns true if DSP code was muting any fragment in the last frame. chan_zap uses this function to decide it needs to turn on confmute on the channel. This is to replace AST_FRAME_DTMF 'm'/'u' (mute/unmute) functionality. (closes issue #11968) Reported by: dimas Patches: v2-11968-dsp.patch uploaded by dimas (license 88) v4-11968-zap.patch uploaded by dimas (license 88) Tested by: dimas, qwell git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111022 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Joshua Colp	a3d7dc8903	Merged revisions 111020 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r111020 | file | 2008-03-26 16:04:35 -0300 (Wed, 26 Mar 2008) | 4 lines If we are requested to authenticate a reinvite make sure that it contains T38 SDP if need be. (closes issue #11995) Reported by: fall ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111021 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Joshua Colp	febd162ed2	Merged revisions 110628 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r110628 | file | 2008-03-25 11:37:35 -0300 (Tue, 25 Mar 2008) | 4 lines Add an option (transmit_silence) which transmits silence during both Record() and DTMF generation. The reason this is an option is that in order to transmit silence we have to setup a translation path. This may not be needed/wanted in all cases. (closes issue #10058) Reported by: tracinet ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111017 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Tilghman Lesher	a46a5e6586	Oops, fix this, too ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111013 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Tilghman Lesher	ef4eff9a9b	Add the "config reload <conffile>" command, which allows you to tell Asterisk ... to reload any file that references a given configuration file. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111012 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Kevin P. Fleming	caf7b47b69	Merged revisions 110962 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r110962 | kpfleming | 2008-03-26 12:43:02 -0500 (Wed, 26 Mar 2008) | 2 lines add note that the user will need to enable codec_ilbc to get it to build ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110963 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Donny Kavanagh	716d4a9be0	revert something dumb, because i was running svn diff in a subfolder not the root of trunk, before doing my commit and did not see it ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110930 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Donny Kavanagh	7a2d8fc309	update documentation to reflect the changes in the way configure detects net-snmp. ... (closes issue #12067) Reported by: juggie Patches: 12067_snmp_doc.patch uploaded by juggie (license 24) Tested by: juggie git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110911 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Kevin P. Fleming	789831ef9a	Merged revisions 110880 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r110880 | kpfleming | 2008-03-26 09:42:35 -0700 (Wed, 26 Mar 2008) | 10 lines Merged revisions 110869 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r110869 | kpfleming | 2008-03-26 08:53:46 -0700 (Wed, 26 Mar 2008) | 2 lines due to licensing restrictions, we cannot distribute the source code for iLBC encoding and decoding... so remove it, and add instructions on how the user can obtain it themselves ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110881 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Mark Michelson	43d70915bb	This ensures that the manager interface is not enabled by default. Prior to this ... change, it was possible to start Asterisk with the manager interface enabled, then either comment out the enabled option or make manager.conf unopenable and the manager interface would still be enabled. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110831 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Jason Parker	1958abd90e	Merged revisions 110779 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r110779 | qwell | 2008-03-25 17:51:17 -0500 (Tue, 25 Mar 2008) | 6 lines Make file access in cdr_custom similar to cdr_csv. Fixes issue #12268. Patch borrowed from r82344 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110780 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Jeff Peeler	13787bc595	This one line change makes an if inside a for loop (in realtime_peer) check all the ast_variables the loop was intending to test rather than just the first one. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110726 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Tilghman Lesher	c6453ded22	Update sample configurations to make virtual hosting more obvious. ... (closes issue #11969) Reported by: pprindeville Patches: acme-virtualpbx.1.6.patch uploaded by pprindeville (license 347) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110691 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Tilghman Lesher	7741ed8bcc	Update the sample configuration, to use Macro less (since it's now deprecated). ... (closes issue #12293) Reported by: pprindeville Patches: bugid-0012293.1.6.patch uploaded by pprindeville (license 347) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110689 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Mark Michelson	a49b6591f5	Oops here too. I need to stop coding for a while... ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110639 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Mark Michelson	67efba6e50	Merged revisions 110635 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r110635 | mmichelson | 2008-03-25 10:40:33 -0500 (Tue, 25 Mar 2008) | 7 lines When reverting a commit, I accidentally left in this bit which was an experiment to see what would happen. It passed the compile test, and I didn't notice I had left this change in too. So this is a revert of a revert...sort of. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110636 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Joshua Colp	738e4ec94e	Add a special dialplan variable to chan_sip which will cause an audio file to be played upon completion of an attended transfer. ... (closes issue #9239) Reported by: sunder git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110631 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Joshua Colp	358ac2f76a	Merged revisions 110628 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r110628 | file | 2008-03-25 11:37:35 -0300 (Tue, 25 Mar 2008) | 4 lines Add an option (transmit_silence) which transmits silence during both Record() and DTMF generation. The reason this is an option is that in order to transmit silence we have to setup a translation path. This may not be needed/wanted in all cases. (closes issue #10058) Reported by: tracinet ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110629 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Olle Johansson	676d9d3303	Use the "Server" header when responding to SIP requests. ... (closes issue #12278) Reported by: rjain Patches: chan_sip.c.diff uploaded by rjain (license 226) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110625 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Mark Michelson	c05501d812	Remove the "Event: registration" header from Asterisk-generated ... SIP REGISTER requests. rjain points out that RFC 3265 specifies that the Event: header is not a valid header for REGISTER requests and that the "registration" value is not defined at IANA. (closes issue #12279) Reported by: rjain Patches: chan_sip.c.diff uploaded by rjain (license 226) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110621 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Mark Michelson	625f6bd203	Merged revisions 110618 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r110618 | mmichelson | 2008-03-24 14:17:41 -0500 (Mon, 24 Mar 2008) | 15 lines This is a revert for revision 108288. The reason is that that revision was not for an actual bug fix per se, and so it really should not have been in 1.4 in the first place. Plus, people who compile with DO_CRASH are more likely to encounter a crash due to this change. While I think the usage of DO_CRASH in ast_sched_del is a bit absurd, this sort of change is beyond the scope of 1.4 and should be done instead in a developer branch based on trunk so that all scheduler functions are fixed at once. I also am reverting the change to trunk and 1.6 since they also suffer from the DO_CRASH potential. (closes issue #12272) Reported by: qq12345 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110619 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Russell Bryant	c087390452	Merged revisions 110614 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r110614 | russell | 2008-03-24 12:34:56 -0500 (Mon, 24 Mar 2008) | 2 lines Turn a NOTICE into a DEBUG message. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110615 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Joshua Colp	5a77d16eda	Only print out the set_address_from_contact host verbose message if debugging is enabled on the dialog. ... (closes issue #12280) Reported by: rjain Patches: chan_sip.c.diff uploaded by rjain (license 226) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110610 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Jason Parker	75ede8b60a	Update to 1.4.11 core sounds. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110578 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Joshua Colp	30d85b3144	Merge over ast_audiohook_volume branch. This adds API calls for use by developers to adjust the volume on a channel. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110542 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Russell Bryant	a567b41083	Note that the TCP and TLS support is currently considered experimental and ... is subject to change while we work out the remaining issues. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110499 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Jason Parker	e3ea6829bb	Merged revisions 110474 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r110474 | qwell | 2008-03-21 09:32:52 -0500 (Fri, 21 Mar 2008) | 7 lines Don't attempt to do optimizations of gsm on mips platforms either. (closes issue #12270) Reported by: zandbelt Patches: 026-gsm-mips.patch uploaded by zandbelt (license 33) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110475 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago