Joshua Colp
4d03b4f268
Don't try to unregister a peer using the sip unregister CLI command if they are not registered. (issue #9811 reported by eliel)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66315 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-28 23:28:52 +00:00
Joshua Colp
39e9b3112c
Due to the way stringfields work the value of the url pointer will always be non-NULL so we have to use ast_strlen_zero to make sure it is not empty. (issue #9821 reported by pj)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-28 23:24:04 +00:00
Joshua Colp
c273ccec41
Blocked revisions 66312 via svnmerge
...
........
r66312 | file | 2007-05-28 19:16:56 -0400 (Mon, 28 May 2007) | 2 lines
Make the usedistinctiveringdetection option work again. (issue #9823 reported by premeau)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-28 23:20:20 +00:00
Olle Johansson
432c8654f5
- Don't re-invent existing headers (some already existed in chan_sip)
...
- Rename command so taht module name comes first
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66295 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-28 18:50:18 +00:00
Tilghman Lesher
b6b254b733
Issue 7021 - Add ICONV function for converting between character sets
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-28 15:59:17 +00:00
Jason Parker
2224a65e25
Blocked revisions 66244 via svnmerge
...
........
r66244 | qwell | 2007-05-26 23:12:37 -0500 (Sat, 26 May 2007) | 4 lines
I don't know what this was trying to do, but it's clearly incorrect.
Issues 9808 and 9809.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66245 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-27 04:15:06 +00:00
Joshua Colp
99eb9421d1
Unlock the minivmlock when no configuration is found. (issue #9814 reported by eliel)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66225 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-26 19:35:33 +00:00
Russell Bryant
8f783b335d
Since this code now uses the API call for creating a detached thread, there
...
is no reason to keep a thread attribute structure on the conference structure.
(Pointed out by Tony Mountifield on the asterisk-dev list)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66208 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-26 06:07:38 +00:00
Kevin P. Fleming
e50d670902
block change that is already here
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66178 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-25 15:08:48 +00:00
Kevin P. Fleming
f371a4c756
more minor fixes
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66175 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-25 15:07:26 +00:00
Tilghman Lesher
ffe08532a4
Merged revisions 66159 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r66159 | tilghman | 2007-05-25 09:41:27 -0500 (Fri, 25 May 2007) | 10 lines
Merged revisions 66127 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r66127 | tilghman | 2007-05-25 08:46:35 -0500 (Fri, 25 May 2007) | 2 lines
Issue 9791 - Fix pronunciation of seconds in Dutch
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66161 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-25 14:49:20 +00:00
Kevin P. Fleming
c74518e3ff
Merged revisions 66157 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66157 | kpfleming | 2007-05-25 10:28:46 -0400 (Fri, 25 May 2007) | 3 lines
handle the GNUTLS library properly in the configure script and build system
don't build in OSP support unless we have found and are allowed to use SSL support
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-25 14:37:55 +00:00
Joshua Colp
f65934a517
Minor tweak... drop translation path if one exists when we get an already signed linear frame in. Chances are the stream has then switched to signed linear and we no longer need the path.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-25 13:26:52 +00:00
Joshua Colp
844394c495
Merged revisions 66074 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66074 | file | 2007-05-24 18:16:58 -0400 (Thu, 24 May 2007) | 2 lines
Fix slinfactory logic when dealing with frames coming in that may already be in the signed linear format.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66109 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-25 01:37:50 +00:00
Russell Bryant
2b25070414
Merged revisions 66076 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66076 | russell | 2007-05-24 17:23:59 -0500 (Thu, 24 May 2007) | 1 line
if the string field init fails, clean up the stuff that was allocated already
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66077 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-24 22:25:55 +00:00
Russell Bryant
9065eb1054
Merged revisions 66070 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66070 | russell | 2007-05-24 17:07:39 -0500 (Thu, 24 May 2007) | 2 lines
Check the result of ast_string_field_init() in ast_channel_alloc()
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66072 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-24 22:08:33 +00:00
Kevin P. Fleming
4573b36af1
use the OpenSSL AES implementation if it's available (unless configured not to)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66071 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-24 22:07:50 +00:00
Russell Bryant
a3d04ce638
Blocked revisions 66068 via svnmerge
...
........
r66068 | russell | 2007-05-24 17:06:13 -0500 (Thu, 24 May 2007) | 2 lines
Make 1.4 build on my machine, too..
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66069 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-24 22:06:41 +00:00
Jason Parker
09e734a563
Merged revisions 66029-66030 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66029 | qwell | 2007-05-24 15:53:18 -0500 (Thu, 24 May 2007) | 2 lines
Following moving strip to AC_PATH_TOOL, we need to do something similar for ar.
........
r66030 | qwell | 2007-05-24 15:54:16 -0500 (Thu, 24 May 2007) | 2 lines
Rebuild configure script for previous ar fix.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66031 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-24 20:55:51 +00:00
Joshua Colp
54bccb409b
Add ListAllVoicemailUsers manager command. (issue #8112 reported by Tony Zhao)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66028 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-24 20:51:47 +00:00
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