Commit Graph

74077 Commits

Author SHA1 Message Date
Diego Novillo
8d669cbd5b invoke.texi: Move -fopenmp description to "Options for Code Generation".
* doc/invoke.texi: Move -fopenmp description to "Options for
	Code Generation".
	Remove reference to -lgomp.

From-SVN: r111429
2006-02-24 17:56:57 -05:00
David Edelsohn
f44a5ab609 * doc/install.texi: Require GNU tar version 1.14.
From-SVN: r111428
2006-02-24 16:52:14 -05:00
Geoffrey Keating
c7b5e39561 Index: gcc/ChangeLog
2006-02-24  Geoffrey Keating  <geoffk@apple.com>

	* doc/tm.texi (Run-time Target): Document C_COMMON_OVERRIDE_OPTIONS.
	* doc/invoke.texi (C++ Dialect Options): Document 
	-fno-use-cxa-get-exception-ptr.
	* configure.ac: Define DEFAULT_USE_CXA_ATEXIT to 2 not 1.
	* configure: Regenerate.
	* c.opt (fuse-cxa-get-exception-ptr): New.
	* c-opts.c (c_common_handle_option): Handle
	OPT_fuse_cxa_get_exception_ptr.
	* c-common.c (flag_use_cxa_atexit): Update documentation.
	(flag_use_cxa_get_exception_ptr): New.
	* c-common.h (flag_use_cxa_get_exception_ptr): New.
	* config/rs6000/darwin.h (SUBTARGET_OVERRIDE_OPTIONS): Improve
	documentation.
	(C_COMMON_OVERRIDE_OPTIONS): New.

Index: gcc/testsuite/ChangeLog
2006-02-24  Geoffrey Keating  <geoffk@apple.com>

	* g++.dg/eh/uncaught1.C: Add dg-options for ppc-darwin.
	* g++.dg/eh/uncaught2.C: New.
	* g++.dg/eh/uncaught3.C: New.

Index: gcc/cp/ChangeLog
2006-02-24  Geoffrey Keating  <geoffk@apple.com>

	* except.c (expand_start_catch_block): Handle
	flag_use_cxa_get_exception_ptr.

From-SVN: r111427
2006-02-24 21:43:01 +00:00
Roger Sayle
676cb929fc re PR middle-end/24952 (ICE: RTL check: expected code 'set' or 'clobber', have 'unspec' in try_combine, at combine.c:2898)
PR middle-end/24952
	* combine.c (try_combine): Explicitly check whether GET_CODE is
	a SET or a CLOBBER, instead on checking that it isn't a USE.

From-SVN: r111425
2006-02-24 19:29:34 +00:00
Paolo Carlini
ffe7d885e0 array (array<>::swap, assign): Implement.
2006-02-24  Paolo Carlini  <pcarlini@suse.de>

	* include/tr1/array (array<>::swap, assign): Implement.
	* include/tr1/array (operator==, operator!=, operator<,
	operator>, operator>=, operator<=, swap, get): Inline.
	* testsuite/tr1/6_containers/array/requirements/member_swap.cc: New.
	* testsuite/tr1/6_containers/array/requirements/assign.cc: Likewise.
	* testsuite/tr1/6_containers/array/specialized_algorithms/swap.cc:
	Likewise.

From-SVN: r111424
2006-02-24 19:13:49 +00:00
Roger Sayle
e26ec0bb06 fold-const.c (fold_comparison): New subroutine of fold_binary containing transformations common to both the...
* fold-const.c (fold_comparison): New subroutine of fold_binary
	containing transformations common to both the equality and
	ordering relational operators, factored out of fold_binary.
	(fold_binary): Separate out the equality operators (EQ_EXPR
	and NE_EXPR) from the ordering operators (LT_EXPR, GT_EXPR,
	LE_EXPR and GE_EXPR), calling fold_comparison to perform the
	transformations common to both.
	(fold_div_compare): Fix latent bugs in the previously unreachable 
	LT_EXPR and GE_EXPR cases.

From-SVN: r111423
2006-02-24 18:56:31 +00:00
Jerry DeLisle
6bb9adda5c re PR libfortran/26423 (Error on binary I/O for large array)
2006-02-24  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/26423
	* gfortran.dg/read_many_1.f: New test.

From-SVN: r111421
2006-02-24 18:23:38 +00:00
Jerry DeLisle
c5418dcb96 re PR libfortran/26423 (Error on binary I/O for large array)
2006-02-24  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/26423
	* io/unix.c (fd_seek): Revert change from 25949.
	(fd_read): Same.
	(fd_write): Same.

From-SVN: r111420
2006-02-24 18:16:25 +00:00
David Edelsohn
69ca354913 rs6000.c (rs6000_init_builtins): Change decl libname for clog to __clog on AIX.
* config/rs6000/rs6000.c (rs6000_init_builtins): Change
	decl libname for clog to __clog on AIX.

	* config/rs6000/xcoff.h (MAX_OFILE_ALIGNMENT): Define.

From-SVN: r111418
2006-02-24 10:50:10 -05:00
Paul Thomas
0f3162e391 re PR fortran/26409 (ICE on Assumed shape nested subroutine)
2006-02-24  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/26409
	* resolve.c (resolve_contained_functions, resolve_types,
	gfc_resolve): Revert patch of 2006-02-19.

From-SVN: r111417
2006-02-24 13:54:06 +00:00
Paul Thomas
8a0b57b3c7 re PR fortran/24519 (gfortran slow because of incomplete dependency checking)
2006-02-24  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/24519
	* dependency.c (gfc_is_same_range): Correct typo.
	(gfc_check_section_vs_section): Call gfc_is_same_range.

	PR fortran/25395
	* trans-common.c (add_equivalences): Add a new flag that is set when
	an equivalence is seen that prevents more from being reset until the
	start of a new traversal of the list, thus ensuring completion of
	all the equivalences.

2006-02-24  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/24519
	* gfortran.dg/dependency_3.f90: New test.
	* gfortran.fortran-torture/execute/vect-3.f90: Remove two of the
	XFAILs.

	PR fortran/25395
	* gfortran.dg/equiv_6.f90: New test.

From-SVN: r111416
2006-02-24 10:51:42 +00:00
Alan Modra
8097c268b0 re PR target/26453 (Segfault with -m64 -mtraceback=full)
PR target/26453
	* config/rs6000/rs6000.c (rs6000_output_function_epilogue): Don't
	output traceback table for thunks.  Localise rs6000_stack_info call.

From-SVN: r111415
2006-02-24 17:00:51 +10:30
Roger Sayle
efbbbb61ee gthr-posix.h (__gthrw): Fix typo in comment.
* gthr-posix.h (__gthrw): Fix typo in comment.

From-SVN: r111414
2006-02-24 04:00:07 +00:00
GCC Administrator
879dda1a44 Daily bump.
From-SVN: r111407
2006-02-24 00:17:56 +00:00
Geoffrey Keating
c1e124094a cpp.texi (Character sets): Document that we do support input files to be in any character set.
* doc/cpp.texi (Character sets): Document that we do support
	input files to be in any character set.

From-SVN: r111401
2006-02-24 00:00:51 +00:00
Jeff Law
357e7a8253 tree.h (PHI_ARG_NONZERO): Remove.
* tree.h (PHI_ARG_NONZERO): Remove.
        * tree-phinodes.c (add_phi_arg): No longer initialize PHI_ARG_NONZERO.
        (remove_phi_arg_num): No longer copy PHI_ARG_NONZERO from the old
        node to the new node.

From-SVN: r111400
2006-02-23 15:58:23 -07:00
Jeff Law
e260a6142e re PR tree-optimization/26425 (ice on valid C code with flag -Os)
PR tree-optimization/26425
	* tree-vrp.c (vrp_visit_assignment): If the LHS's type has a NULL
	min/max, then assume its varying.

	* gcc.c-torture/compile/pr26425.c: New test.

From-SVN: r111399
2006-02-23 15:47:58 -07:00
Erik Edelmann
10c5bc6c2d module.c (read_module): Remove redundant code lines.
2006-02-23  Erik Edelmann  <eedelman@gcc.gnu.org>

        * module.c (read_module): Remove redundant code lines.

From-SVN: r111398
2006-02-23 21:58:58 +00:00
Zdenek Dvorak
e755fcf517 re PR middle-end/26316 (loop-invariant miscompiles openmp.c)
PR rtl-optimization/26316
	* rtlanal.c (enum may_trap_p_flags): New.
	(may_trap_p_1): Take flags instead of unaligned_mems argument.  Ignore
	MEM_NOTRAP_P if flags & MTP_AFTER_MOVE.
	(may_trap_p, may_trap_or_fault_p): Pass flags to may_trap_p_1.
	(may_trap_after_code_motion_p): New function.
	* loop-invariant.c (find_identical_invariants): Fix dump formating.
	(find_invariant_insn): Use may_trap_after_code_motion_p.
	* rtl.h (may_trap_after_code_motion_p): Declare.

From-SVN: r111397
2006-02-23 21:03:05 +00:00
Zdenek Dvorak
65acccdd22 emit-rtl.c (immed_double_const): Cleanup.
* emit-rtl.c (immed_double_const): Cleanup.

From-SVN: r111396
2006-02-23 20:55:21 +00:00
Scott Gilbertson
cbb5e20166 IntegerGraphicsState.java (getClip): Clone clip before returning, handle null clip.
2006-02-23  Scott Gilbertson  <scottg@mantatest.com>

	* gnu/awt/j2d/IntegerGraphicsState.java (getClip): Clone clip
	before returning, handle null clip.
	(getClipBounds): Handle null clip.
	* gnu/awt/j2d/Graphics2DImpl.java (clipRect): Handle null clip.
	* gnu/awt/xlib/XCanvasPeer.java (): 
	(getLocationOnScreen): Implement.
	* classpath/gnu/java/awt/peer/GLightweightPeer.java
	(repaint): Merged with Classpath.
	* classpath/java/awt/Graphics.java (hitClip): Merged with
	Classpath.

From-SVN: r111395
2006-02-23 20:50:49 +00:00
Rafael Espindola
072b06f2dc add missing full stops in the changelog of a previous patch
From-SVN: r111394
2006-02-23 20:32:24 +00:00
Benjamin Kosnik
4c63b78298 1.cc (test01): Change int to size_t.
2006-02-23  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/22_locale/codecvt/in/wchar_t/1.cc (test01): Change int
	to size_t. Use explicit static_cast for casts.
	* testsuite/22_locale/codecvt/in/wchar_t/6.cc (test06): Same.
	* testsuite/22_locale/codecvt/in/wchar_t/5.cc (test05): Same.
	* testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc (test01): Same.

From-SVN: r111393
2006-02-23 20:20:57 +00:00
Daniel Berlin
4b0e73469f re PR tree-optimization/26376 (K+R style function compiled with -fipa-pta ICEs)
2006-02-23  Daniel Berlin  <dberlin@dberlin.org>
	
	Fix PR tree-optimization/26376
	* tree-ssa-structalias.c (find_func_aliases):  Use get_id_for_tree,
	remove assert.

From-SVN: r111392
2006-02-23 18:16:12 +00:00
Jakub Jelinek
a5c8d67f10 re PR middle-end/26412 (ICE with external arrays using OpenMP)
PR middle-end/26412
	* gimplify.c (omp_add_variable): Guard variable size decl test with
	DECL_SIZE (decl) check.

	* gcc.dg/gomp/pr26412.c: New test.

From-SVN: r111391
2006-02-23 19:06:21 +01:00
Richard Guenther
98b2060a0d re PR middle-end/26439 (missing VOPs for complex assignments)
2006-02-23  Richard Guenther  <rguenther@suse.de>

	PR middle-end/26439
	* tree-ssa-structalias.c (find_func_aliases): Handle complex types
	like aggregate types.

From-SVN: r111389
2006-02-23 16:03:47 +00:00
Andrew Haley
b9e6e5887a jcf-parse.c (parse_class_file): Set input_location from current_class.
2006-02-20  Andrew Haley  <aph@redhat.com>

        * jcf-parse.c (parse_class_file): Set input_location from
        current_class.

From-SVN: r111383
2006-02-23 10:34:38 +00:00
Jakub Jelinek
ed965309da [multiple changes]
2006-02-23  Jakub Jelinek  <jakub@redhat.com>

	* configure.ac: Add --with{,out}-long-double-128 configure option.
	(TARGET_DEFAULT_LONG_DOUBLE_128): New test.
	* configure: Rebuilt.
	* config.in: Rebuilt.
	* doc/install.texi (Options specification): Document
	--with-long-double-128.

	* config/rs6000/linux.h [TARGET_DEFAULT_LONG_DOUBLE_128]
	(RS6000_DEFAULT_LONG_DOUBLE_SIZE): Define to 128.
	* config/rs6000/linux64.h [TARGET_DEFAULT_LONG_DOUBLE_128]
	(RS6000_DEFAULT_LONG_DOUBLE_SIZE): Define to 128.

2006-02-23  Aldy Hernandez  <aldyh@redhat.com>

	* config/s390/s390.c (override_options): Handle
	TARGET_DEFAULT_LONG_DOUBLE_128.

	* config/alpha/alpha.c (override_options): Handle
	TARGET_DEFAULT_LONG_DOUBLE_128.

	* config/sparc/sparc.c (sparc_override_options): Handle
	TARGET_DEFAULT_LONG_DOUBLE_128.

From-SVN: r111381
2006-02-23 09:58:22 +01:00
GCC Administrator
29b1a829ad Daily bump.
From-SVN: r111378
2006-02-23 00:17:51 +00:00
Daniel Jacobowitz
9fb03bd8d7 Makefile.in (stmp-fixinc): Use real-$(INSTALL_HEADERS_DIR).
* Makefile.in (stmp-fixinc): Use real-$(INSTALL_HEADERS_DIR).
	(real-install-headers-tar, real-install-headers-cpio)
	(real-install-headers-cp): New targets.

From-SVN: r111372
2006-02-22 20:21:14 +00:00
Paolo Carlini
90fc5c36c1 2006-02-22 Paolo Carlini <pcarlini@suse.de>
* Adjust last ChangeLog.

From-SVN: r111370
2006-02-22 20:02:37 +00:00
Richard Sandiford
e8dad6f060 tree.h (variable_section): Delete.
* tree.h (variable_section): Delete.
	* varasm.c (variable_section): Delete.

From-SVN: r111369
2006-02-22 19:58:37 +00:00
Paolo Carlini
55e35fb7d2 basic_tree_assoc_cntnr_node_iterator.html: Fix links.
2006-02-22  Paolo Carlini  <pcarlini@suse.de>

	* docs/html/ext/pb_assoc/basic_tree_assoc_cntnr_node_iterator.html:
	Fix links.
	* docs/html/ext/pb_assoc/hash_based_containers.html: Likewise.
	* docs/html/ext/pb_assoc/hash_standard_resize_policy.html: Likewise.
	* docs/html/ext/pb_assoc/interface.html: Likewise..
	* docs/html/ext/pb_assoc/list_updates.html: Likewise.
	* docs/html/ext/pb_assoc/resize_policies.html: Likewise.
	* docs/html/ext/pb_assoc/sample_probe_fn.html: Likewise.
	* docs/html/ext/pb_assoc/sample_range_hashing.html: Likewise.
	* docs/html/ext/pb_assoc/sample_ranged_hash_fn.html: Likewise.
	* docs/html/ext/pb_assoc/sample_ranged_probe_fn.html: Likewise.
	* docs/html/ext/pb_assoc/sample_resize_policy.html: Likewise.
	* docs/html/ext/pb_assoc/tree_assoc_cntnr_const_node_iterator.html:
	Likewise.
	* docs/html/ext/pb_assoc/tree_assoc_cntnr_node_iterator.html: Likewise.

From-SVN: r111368
2006-02-22 19:58:08 +00:00
Volker Reichelt
6484413978 re PR c++/26291 (Invalid ellipsis in operator not diagnosed)
PR c++/26291
	* decl.c (grok_op_properties): Check for ellipsis in arguments of
        operators.

	* g++.dg/other/ellipsis1.C: New test.
	* g++.dg/parse/operator4.C: Adjust error marker.

From-SVN: r111367
2006-02-22 17:22:08 +00:00
Paolo Carlini
f8190ffc6c re PR libstdc++/26132 (tr1/hashtable: rehash not implemented)
2006-02-22  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/26132
	* include/tr1/hashtable (hashtable<>::rehash): Define.
	* testsuite/tr1/6_containers/unordered/hashtable/26132.cc: New.

	* include/tr1/hashtable: Trivial formatting and stylistic fixes.

	* testsuite/tr1/headers.cc: remove <tr1/hashtable>, not a tr1 header,
	only an implementation detail.

From-SVN: r111366
2006-02-22 17:05:58 +00:00
H.J. Lu
e3a26d2fc5 re PR target/25603 (Miscompiled FORTRAN program)
2006-02-22  H.J. Lu  <hongjiu.lu@intel.com>

	PR target/25603
	* gfortran.dg/pr25603.f: New testcase.

From-SVN: r111365
2006-02-22 08:59:45 -08:00
Paolo Bonzini
d7f755c32d install.texi: Add notes on install.texi2html.
2006-02-22  Paolo Bonzini  <bonzini@gnu.org>

	* install.texi: Add notes on install.texi2html.
	(Building in parallel): Do not use footnotes.

From-SVN: r111363
2006-02-22 13:36:31 +00:00
Kaz Kojima
0a4e2bb585 sysv.S: Fix register numbers in the FDE for ffi_closure_SYSV.
* src/sh/sysv.S: Fix register numbers in the FDE for
	ffi_closure_SYSV.

From-SVN: r111362
2006-02-22 11:26:05 +00:00
Paolo Carlini
afde1de353 list (splice): Remove splice_alloc check, redundant after implementing the splice bits of N1599.
2006-02-22  Paolo Carlini  <pcarlini@suse.de>

	* include/debug/list (splice): Remove splice_alloc check, redundant
	after implementing the splice bits of N1599.

From-SVN: r111361
2006-02-22 10:20:09 +00:00
Nathan Sidwell
6217ebd277 bf-spl1.c: Don't specify -m68000.
* gcc.dg/bf-spl1.c: Don't specify -m68000.
	* g++.old-deja/g++.pt/static11.C: Xfail for m68k-elf

From-SVN: r111360
2006-02-22 09:05:07 +00:00
Benjamin Kosnik
0d4124d448 cmath.tcc: Use _GLIBCXX_BEGIN_NAMESPACE, _GLIBCXX_END_NAMESPACE.
2006-02-21  Benjamin Kosnik  <bkoz@redhat.com>

	* include/c_std/cmath.tcc: Use _GLIBCXX_BEGIN_NAMESPACE,
	_GLIBCXX_END_NAMESPACE.

From-SVN: r111357
2006-02-22 02:26:47 +00:00
Benjamin Kosnik
45f388bb44 c++config: Simplify debug namespaces.
2006-02-21  Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/c++config: Simplify debug namespaces.
	* include/ext/hash_set: Specialize insert_iterator after norm,
	debug containers have been (optionally) declared. Use nested
	namespaces.	
	* include/ext/hash_map: Same.
	* include/debug/hash_map.h (insert): Add specialization for value
	pointer types.
	* include/debug/hash_set.h (insert): Same.
	* include/debug/hash_multimap.h: Change __gnu_debug_def to __debug.
	* include/debug/set.h: Same.
	* include/debug/bitset: Same.
	* include/debug/multiset.h: Same.
	* include/debug/hash_multiset.h: Same.
	* include/debug/vector: Same.
	* include/debug/map.h: Same.
	* include/debug/deque: Same.
	* include/debug/list: Same.
	* include/debug/multimap.h. Same.
	* include/debug/macros.h: Use __gnu_debug.
	* include/debug/debug.h: Same.
	* include/debug/formatter.h: Same.
	* include/debug/safe_sequence.h: Same.
	* include/debug/functions.h: Same.
	* include/debug/safe_base.h: Same.
	* include/debug/safe_iterator.h: Same.
	* include/debug/safe_iterator.tcc: Same.
	(_M_invalidate): Adjust compare order.
	* include/debug/string: Change std::__gnu_debug to __gnu_debug.
	* include/ext/hashtable.h: Formatting fixes.
	* include/bits/stl_map.h: Formatting fixes.		
	* src/compatibility.cc: Adjust compatibility symbols for old debug
	mode model.	
	* src/debug_list.cc: Tweak.
	* src/debug.cc: Adjust namespaces.
	* docs/html/debug_mode.html: Adjust namespace names.
	* testsuite/25_algorithms/heap/heap.cc: Restore _GLIBCXX_DEBUG
	macro guards, as count values differ when in debug mode.	
	* testsuite/23_containers/vector/26412.cc: Move to...
	* testsuite/23_containers/vector/26412-1.cc: ... here.
	* testsuite/23_containers/vector/26412-2.cc: Add.

	* include/ext/pb_assoc/detail/standard_policies.hpp
	(PB_ASSOC_HASH_NAMESPACE): Remove, use __gnu_cxx::hash_map and
	std::equal_to.

	* configure.ac (libtool_VERSION): To 6:8:0.
	* configure: Regenerate.
	* config/abi/pre/gnu.ver: Revert to exporting __gnu_debug symbols.
	(GLIBCXX_3.4.8): New.
	* testsuite/testsuite_abi.cc: Add GLIBCXX_3.4.8 to known versions.

From-SVN: r111356
2006-02-22 00:57:24 +00:00
Paolo Carlini
03ba64bb82 hashtable: Trivial formatting fixes.
2006-02-21  Paolo Carlini  <pcarlini@suse.de>

	* include/tr1/hashtable: Trivial formatting fixes.

From-SVN: r111355
2006-02-22 00:42:04 +00:00
GCC Administrator
411c6f862f Daily bump.
From-SVN: r111353
2006-02-22 00:17:53 +00:00
Aldy Hernandez
4fe7a8bcef re PR libgomp/26234 (--disable-libgomp is not documented)
PR libgomp/26234
	* doc/install.texi (Configuration): Document --disable-libgomp.

From-SVN: r111345
2006-02-21 21:53:21 +00:00
Geoffrey Keating
6070e8e5e3 * config/i386/darwin.h (DWARF2_FRAME_REG_OUT): New.
From-SVN: r111344
2006-02-21 20:36:35 +00:00
Erik Edelmann
b9bd11ca41 MAINTAINERS (Write After Approval): Remove myself.
2006-02-21  Erik Edelmann  <eedelman@gcc.gnu.org>

        * MAINTAINERS (Write After Approval):  Remove myself.
        (Language Front End Maintainers):  Add myself as fortran 95 maintainer.

From-SVN: r111343
2006-02-21 20:28:06 +00:00
Alexandre Oliva
f877011111 sse.md (vec_extractv2df_1_sse): New.
* config/i386/sse.md (vec_extractv2df_1_sse): New.
(vec_extractv2df_0_sse): New.

From-SVN: r111342
2006-02-21 19:24:48 +00:00
Alexandre Oliva
35d177a2f8 defaults.h (CFA_FRAME_BASE_OFFSET): Define.
* defaults.h (CFA_FRAME_BASE_OFFSET): Define.
* config/ia64/ia64.h (CFA_FRAME_BASE_OFFSET): Override.
* doc/tm.texi (CFA_FRAME_BASE_OFFSET): Document.
* dwarf2out.c (build_cfa_loc): New offset parameter.  Add it
to the result of the expression.
(def_cfa_1): Adjust.
(frame_pointer_cfa_offset): Rename to...
(frame_pointer_fb_offset): ... this.  Adjust all uses.
(convert_cfa_to_loc_list): Rename to...
(convert_cfa_to_fb_loc_list): ... this.  New offset parameter.
Pass it on to build_cfa_loc.
(compute_frame_pointer_to_cfa_displacement): Rename to...
(compute_frame_pointer_to_fb_displacement): ... this.  New
offset parameter.  Use it in computation.
(gen_subprogram_die): Compute cfa_fb_offset with the new
macro, and use it to compute the fb loc list and the
displacement.

From-SVN: r111341
2006-02-21 19:21:21 +00:00
Rainer Orth
529490b41a re PR libobjc/26309 (libobjc bootstrap failure on Tru64 UNIX V4.0F)
PR libobjc/26309
	* thr-objc.c (_XOPEN_SOURCE): Don't define on Tru64 UNIX.

From-SVN: r111339
2006-02-21 19:13:21 +00:00