Jonathan Rose
31f1881ceb
GSM: Fix encoding problems with GSM
...
(closes issue ASTERISK-20457)
Reported by: Richard Miller
Patches:
code.patch uploaded by Richard Miller (license 5685)
........
Merged revisions 375272 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375273 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375288 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375291 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-10-22 17:31:20 +00:00
Kinsey Moore
8696daadf8
Simplify build system architecture optimization
...
This change to the build system rips out any usage of PROC along with
architecture-specific optimizations in favor of using -march=native where it is
supported. This fixes broken builds on 64bit Intel systems and results in
better optimized code on systems running GCC 4.2+.
Review: https://reviewboard.asterisk.org/r/1852/
(closes issue ASTERISK-19462)
........
Merged revisions 361955 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 361956 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@361968 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-04-12 15:25:47 +00:00
Tilghman Lesher
5e7121b44f
Merged revisions 336734 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/10
................
r336734 | tilghman | 2011-09-19 15:29:40 -0500 (Mon, 19 Sep 2011) | 18 lines
Merged revisions 336733 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r336733 | tilghman | 2011-09-19 15:27:03 -0500 (Mon, 19 Sep 2011) | 11 lines
Various changes to allow 1.8 to compile on Mac OS X Lion (10.7)
* Makefile workaround for 10.6 extended to work on 10.7 and later.
* Now uses the 'weak' symbol for Lion systems, which no longer support
'weak_import'
Closes ASTERISK-17612.
Closes ASTERISK-18213.
Tested by: tilghman, oej.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336735 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-19 20:31:09 +00:00
Kevin P. Fleming
7cf70df999
Use "-march=native" when possible.
...
Recent versions of GCC have a tuning option value of 'native', which causes
the compiler to optimize the build for the CPU the compile is performed on.
Since most people are building Asterisk on the machine they plan to run it on,
the configure script and build system will now use this value unless a different
value is specified by the user in CFLAGS when the configure script is executed.
In addition, this value will be used for building the GSM and LPC10 codecs as
well, in preference to the logic that has been in their Makefiles forever to
optimize for certain types of CPUs.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@310332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-11 15:09:23 +00:00
Paul Belanger
73c22a15b9
Merged revisions 285819 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r285819 | pabelanger | 2010-09-09 18:52:31 -0400 (Thu, 09 Sep 2010) | 22 lines
Merged revisions 285818 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r285818 | pabelanger | 2010-09-09 18:49:19 -0400 (Thu, 09 Sep 2010) | 15 lines
Merged revisions 285817 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r285817 | pabelanger | 2010-09-09 18:34:35 -0400 (Thu, 09 Sep 2010) | 8 lines
GCC 4.2.x optimizations result in improper behavior of GSM codec
(closes issue #17688 )
Reported by: pprindeville
Patches:
asterisk-trunk-bugid11243.patch uploaded by pprindeville (license 347)
Tested by: mkeuter, pprindeville
........
................
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-09 22:53:44 +00:00
Tilghman Lesher
fcdd407f5c
OSARCH is not inherited to this directory
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@252760 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-16 18:40:14 +00:00
Tilghman Lesher
f053b65f17
Make the Makefile logic more explicit and move the Snow Leopard logic down to where it's not executed on non-Darwin systems.
...
(closes issue #17028 )
Reported by: pabelanger
Patches:
issue17028_20100315.patch uploaded by seanbright (license 71)
20100315__issue17028.diff.txt uploaded by tilghman (license 14)
Tested by: tilghman, pabelanger
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@252488 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-15 16:27:08 +00:00
Tilghman Lesher
c1e33534a5
Build system modifications to ensure that Asterisk properly builds on Mac OS X 10.6.
...
(closes issue #16997 )
Reported by: jquinn
Patches:
20100309__issue16997__2.diff.txt uploaded by tilghman (license 14)
Tested by: tilghman, russell
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@251475 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-09 20:30:03 +00:00
Kevin P. Fleming
96e4e31eeb
Merged revisions 207647 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r207647 | kpfleming | 2009-07-21 08:04:44 -0500 (Tue, 21 Jul 2009) | 12 lines
Ensure that user-provided CFLAGS and LDFLAGS are honored.
This commit changes the build system so that user-provided flags (in ASTCFLAGS
and ASTLDFLAGS) are supplied to the compiler/linker *after* all flags provided
by the build system itself, so that the user can effectively override the
build system's flags if desired. In addition, ASTCFLAGS and ASTLDFLAGS can now
be provided *either* in the environment before running 'make', or as variable
assignments on the 'make' command line. As a result, the use of COPTS and LDOPTS
is no longer necessary, so they are no longer documented, but are still supported
so as not to break existing build systems that supply them when building Asterisk.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@207680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-07-21 13:28:04 +00:00
David Vossel
dcfe69ec64
fixes some memory leaks and redundant conditions
...
(closes issue #15269 )
Reported by: contactmayankjain
Patches:
patch.txt uploaded by contactmayankjain (license 740)
memory_leak_stuff.trunk.diff uploaded by dvossel (license 671)
Tested by: contactmayankjain, dvossel
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-18 16:37:42 +00:00
Kevin P. Fleming
8d5deb312b
Merged revisions 157859 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r157859 | kpfleming | 2008-11-19 15:34:47 -0600 (Wed, 19 Nov 2008) | 7 lines
the gcc optimizer frequently finds broken code (use of uninitalized variables, unreachable code, etc.), which is good. however, developers usually compile with the optimizer turned off, because if they need to debug the resulting code, optimized code makes that process very difficult. this means that we get code changes committed that weren't adequately checked over for these sorts of problems.
with this build system change, if (and only if) --enable-dev-mode was used and DONT_OPTIMIZE is turned on, when a source file is compiled it will actually be preprocessed (into a .i or .ii file), then compiled once with optimization (with the result sent to /dev/null) and again without optimization (but only if the first compile succeeded, of course).
while making these changes, i did some cleanup work in Makefile.rules to move commonly-used combinations of flag variables into their own variables, to make the file easier to read and maintain
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@157974 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-20 00:08:12 +00:00
Jason Parker
7af650c18b
Merged revisions 111856 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r111856 | qwell | 2008-03-28 16:45:35 -0500 (Fri, 28 Mar 2008) | 12 lines
Allow gsm to compile correctly on x86 with gcc4 optimizations.
(closes issue #11243 )
Reported by: whiskerp
Patches:
11243-maybe-asm.diff uploaded by qwell (license 4)
Tested by: Seggy (IRC)
Note: While I did write this patch, I would not have found this if fossil
had not reported and fixed issue #12253 . A huge thanks to him for helping
to (indirectly) find the problem here.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111857 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-28 21:46:02 +00:00
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
2008-03-21 14:36:17 +00:00
Joshua Colp
c23f7d8b38
Merged revisions 82265 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82265 | file | 2007-09-11 18:41:49 -0300 (Tue, 11 Sep 2007) | 4 lines
(closes issue #10679 )
Reported by: andrew
Build under dev mode when K6OPTS is enabled.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-11 21:43:47 +00:00
Joshua Colp
ca635f3407
Return GSM to a state where it actually builds under dev mode.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55352 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-18 19:13:17 +00:00
Russell Bryant
7c869e6f98
Merged revisions 55050 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r55050 | russell | 2007-02-16 18:31:42 -0600 (Fri, 16 Feb 2007) | 3 lines
Filter out yet another architecture that does not work with the optimizations
in the built-in libgsm. (issue 8637, ovi)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-17 00:32:16 +00:00
Russell Bryant
73409003e2
Merged revisions 51331 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51331 | russell | 2007-01-19 13:30:54 -0600 (Fri, 19 Jan 2007) | 3 lines
Add a couple more processors that need optimizations excluded.
(issue #8637 )
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19 19:31:54 +00:00
Kevin P. Fleming
920de98f68
Merged revisions 48554 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48554 | kpfleming | 2006-12-18 05:59:24 -0600 (Mon, 18 Dec 2006) | 3 lines
remove some now-unnecessary explicit includes of autoconfig.h
clean up per-file dependencies during 'make clean'
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48555 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-18 11:59:48 +00:00
Russell Bryant
f89ccdc0f3
Merged revisions 46847 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r46847 | russell | 2006-11-01 17:51:21 -0500 (Wed, 01 Nov 2006) | 3 lines
Fixes for cross-compilation on mips
(issue #8058 , ywalther, with some modifications)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46848 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-01 22:54:15 +00:00
Kevin P. Fleming
e92c34cc38
Merged revisions 44055 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44055 | kpfleming | 2006-09-29 17:47:40 -0500 (Fri, 29 Sep 2006) | 2 lines
fix a few build system bugs, and convert Makefiles to be compatible with GNU make 3.80
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44056 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-29 22:48:43 +00:00
Kevin P. Fleming
89050169c8
Merged revisions 43996-43997,44008,44011-44012 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43996 | kpfleming | 2006-09-29 11:47:05 -0500 (Fri, 29 Sep 2006) | 2 lines
another cross-compile fix
........
r43997 | kpfleming | 2006-09-29 11:52:27 -0500 (Fri, 29 Sep 2006) | 2 lines
support --without-curl in configure script
........
r44008 | kpfleming | 2006-09-29 13:25:49 -0500 (Fri, 29 Sep 2006) | 2 lines
don't abuse CFLAGS and LDFLAGS for build of Asterisk components, because they are also then used for non-Asterisk components (like menuselect); use our own variables instead
........
r44011 | kpfleming | 2006-09-29 13:40:17 -0500 (Fri, 29 Sep 2006) | 2 lines
missed one conversion to ASTCFLAGS
........
r44012 | kpfleming | 2006-09-29 13:49:07 -0500 (Fri, 29 Sep 2006) | 2 lines
yet another place where we were not using the correct CFLAGS by default
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44013 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-29 18:54:21 +00:00
Jason Parker
8699205857
be a little more consistent with our variable usage
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43257 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-19 14:16:12 +00:00
Russell Bryant
9df34a3d40
fix codec_gsm build for powerpc
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40993 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-24 19:07:01 +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
Steve Murphy
1bb760f347
Added a small fix to exclude the AMD optimized assembly file from being included in the compile.
...
I don't particular like the approach, which basically tries to exclude the file based on
NOT being in a list of arches. This, IMHO, is backwards, it should be a list of AMD arches
instead. "Better to light a candle, than to curse the darkness", is apropo here. But since I don't
have an exhaustive list of what those arches could be, I leave as-is for now.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@38187 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-24 20:58:27 +00:00
Russell Bryant
ebbca8319b
eliminate warning about unused variable that occurs in some cases
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37298 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-07 16:07:17 +00:00
Kevin P. Fleming
4f826452cf
make the build output less noisy (optional, can be controlled by the NOISY_BUILD variable in the top-level Makefile)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-06 23:18:45 +00:00
Kevin P. Fleming
b31b0be819
various minor portability fixes (mostly from tholo for OpenBSD)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-09 20:26:25 +00:00
Kevin P. Fleming
9afb0e1cd2
Merged revisions 30874 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r30874 | kpfleming | 2006-05-30 14:18:30 -0500 (Tue, 30 May 2006) | 2 lines
check the proper variable...
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30875 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-30 19:20:20 +00:00
Kevin P. Fleming
96016e9206
Merged revisions 30802 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r30802 | kpfleming | 2006-05-30 11:07:16 -0500 (Tue, 30 May 2006) | 2 lines
another S/390 build fix
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30803 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-30 16:08:38 +00:00
Kevin P. Fleming
35fa97d1d5
use the proper method for adding a new entry
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-25 19:26:26 +00:00
Kevin P. Fleming
df814221c1
Merged revisions 30296 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r30296 | kpfleming | 2006-05-25 12:39:33 -0500 (Thu, 25 May 2006) | 2 lines
don't try to use -march=s390 when building on S/390 systems (reported via asterisk-users mailing list)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-25 17:39:46 +00:00
Kevin P. Fleming
574e14cbea
Thanks to the fine work of Russell Bryant and Dancho Lazarov, we now have autoconf and menuselect tools for Asterisk!
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22267 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-24 17:11:45 +00:00
Joshua Colp
5b1069f262
Add more 64-bit detection goodness (issue #6850 reported by evilbunny)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@16564 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-30 21:57:49 +00:00
Tilghman Lesher
adef31698f
Bug 6709 - Simplify extensive embedded ifneq logic (and fix missing endif's)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@12714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-13 05:24:13 +00:00
Russell Bryant
083a9627b5
Merged revisions 12577 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r12577 | russell | 2006-03-12 12:57:37 -0500 (Sun, 12 Mar 2006) | 2 lines
fix build on parisc (issue #6704 )
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@12610 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-12 18:07:23 +00:00
Kevin P. Fleming
6204abdae2
merge rizzo's patch to make compiler warnings stop the build, and fix a bunch of warnings found
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10805 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-02-22 22:53:49 +00:00
Kevin P. Fleming
4ed461db16
set proper mime-type and eol-style on all files
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9991 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-02-14 19:14:15 +00:00
Kevin P. Fleming
c7da92d2ea
fix compiler warnings
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9468 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-02-11 03:13:25 +00:00
Matthew Fredrickson
4f803dfda0
Lots of little fixes for doing MSVC compiling codecs in windows ( #6022 )
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9450 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-02-10 23:37:27 +00:00
Matthew Fredrickson
67e32c3f2d
fix for codec_gsm on ia64 ( #6294 )
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-01-20 23:28:37 +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
Kevin P. Fleming
c14588af86
remove remaining .cvsignore files
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7220 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-11-29 18:09:49 +00:00
Kevin P. Fleming
77390dfeaf
issue #5572
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-11-08 03:31:45 +00:00
Kevin P. Fleming
7ffb604a2f
issue #4678
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6936 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-11-01 21:53:30 +00:00
Mark Spencer
df909bed06
Fix ipaq build (bug #4545 )
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5937 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-06-18 17:54:15 +00:00
Matthew Fredrickson
ef254b7819
Makefile update for codec_gsm.c to cross compile for powerpc (bug #4228 )
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5645 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-05-13 14:59:01 +00:00
Kevin P. Fleming
a729a57ba1
fix various compiler warnings
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5491 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-04-21 06:30:23 +00:00
Mark Spencer
a0a2592025
Fix cross compiling (bug #3868 )
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-03-27 22:39:17 +00:00
Mark Spencer
1bb8d52938
Flush out app stuff, make profiling easier to turn on/off
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5150 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-03-05 21:06:26 +00:00