Tcl Source Code

Timeline
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

152 check-ins using file changes version 2d75f491ab

2016-06-16
14:23
[16828b3744] Prototype fix for merging forward. check-in: a39b2cd748 user: dgp tags: bug-16828b3744
2010-11-04
12:22
Correct typo and mistaken comment. check-in: 3c23ea3a5e user: dgp tags: trunk
2010-11-03
12:09
[FRQ 2965056]: Windows build with -DUNICODE (more clean-ups for pre-win2000 stuff) check-in: 95f431bdb6 user: nijtmans tags: trunk
11:08
* generic/tclCmdMZ.c (TryPostBody): Ensure that errors when setting * tests/error.test (error-19....
check-in: 24c6bb8619 user: dkf tags: trunk
00:59
* generic/tclCompCmds.c (TclCompileCatchCmd): * tests/compile.test (compile-3,6): Reworked the compi... check-in: 97b99f9b41 user: kennykb tags: trunk
00:18
merge check-in: ba3f35980c user: kennykb tags: dogeen-assembler-branch
2010-11-02
21:42
Improved handling of non-standard module path lists, empty path lists in particular. check-in: 2704d47a48 user: stwo tags: trunk
2010-11-01
19:36
* library/tzdata/Asia/Hong_Kong: * library/tzdata/Pacific/Apia: * library/tzdata/Pacific/Fiji: Ols... check-in: 4bb04ed7a2 user: kennykb tags: trunk
2010-10-30
15:20
merge check-in: c4331a6f6a user: kennykb tags: dogeen-assembler-branch
2010-10-29
16:42
Stop small [afters] from wasting CPU [Bug 2905784] while keeping accuracy. check-in: 7bdf4e3a7a user: ferrieux tags: trunk
2010-10-28
19:42
merge check-in: e30f206d70 user: kennykb tags: dogeen-assembler-branch
19:40
* generic/tclAssembly.c: * tests/assembly.test (assemble-31.*): Added jump tables. check-in: 54012f03a2 user: kennykb tags: dogeen-assembler-branch
16:38
* tests/http.test: Make http-4.15 pass in isolation [Bug 3097490]
check-in: 045ee183cb user: dgp tags: trunk
16:22
* unix/tclUnixSock.c: Prevent calls freeaddrinfo(NULL) which can crash some system...
check-in: cd9adaa46d user: dgp tags: trunk
2010-10-26
19:56
Split from ChangeLog check-in: 183b97080e user: rmax tags: trunk
16:14
* Changelog.2008: Split off from Changelog. * generic/tclIOSock.c (TclCreateSocketAddress): The inte... check-in: dc75730925 user: rmax tags: trunk
15:05
Coverage test for portion of ExprSqrtFunc() check-in: c5543f40c3 user: dgp tags: trunk
13:59
* unix/tclUnixSock.c (TcpGetOptionProc): Prevent crash if interp is * win/tclWinSock.c (TcpGetOpti...
check-in: 6ecb99bd0f user: dkf tags: trunk
13:14
Add support for ::tcl::unsupported::noReverseDNS check-in: 714ff5371e user: rmax tags: trunk
2010-10-24
01:46
* tclAssembly.c: * assembly.test (assemble-17.15): Reworked branch handling so that forward branches... check-in: 590db18cde user: kennykb tags: dogeen-assembler-branch
2010-10-23
16:14
removed useless separation between tclAssembly.h and tclAssembly.c check-in: ef10316ff7 user: kennykb tags: dogeen-assembler-branch
15:49
merge check-in: e0bbf06869 user: kennykb tags: dogeen-assembler-branch
2010-10-20
20:52
[Patch 2995655] Report inner contexts in [info errorstack] check-in: 14d357357c user: ferrieux tags: trunk
13:34
* generic/tclCompCmds.c (TclCompileDictForCmd): Update the compilation * generic/tclCompile.c (tcl...
check-in: 12807417a7 user: dkf tags: trunk
01:50
merge check-in: 6c4e1f869f user: kennykb tags: dogeen-assembler-branch
2010-10-19
22:50
* generic/tclZlib.c (Tcl_ZlibStreamGet): [Bug 3081008]: Ensure that when a bytearray gets its inte...
check-in: 885ee93472 user: dkf tags: trunk
21:23
* generic/tclZlib.c: Purge code that wrote to the object returned by Tcl_GetObjResult, as we don't...
check-in: e451f7d810 user: dkf tags: trunk
2010-10-18
21:47
[Bug 3085863]: tclUniData 9 years old Added testcases for Unicode 6.0 check-in: 66a4ae270f user: nijtmans tags: trunk
2010-10-17
20:20
Document [info errorstack] faithfully. check-in: 9de23601f8 user: ferrieux tags: trunk
20:16
Document [info errostack] faithfully. check-in: 997462044d user: ferrieux tags: trunk
2010-10-16
20:27
* generic/tclExecute.c (ReleaseDictIterator): Factored out the release of the bytecode-level dicti...
check-in: ed00f69eaf user: dkf tags: trunk
2010-10-15
15:25
[Bug 3085863] tclUniData 9 years old: Updated Unicode tables to latest UnicodeData.txt, correspondin... check-in: 6ba009f19d user: nijtmans tags: trunk
2010-10-13
17:10
remove outdated comment check-in: 9afc385ea0 user: dgp tags: trunk
16:41
* generic/tclCompile.c: Alternative fix for [Bugs 467523,983660] where * generic/tcl...
check-in: 92a9cb47fb user: dgp tags: trunk
15:32
tclWinThrd.h: (removed) because it is just empty en used nowhere check-in: 78864676d1 user: nijtmans tags: trunk
2010-10-12
15:19
Generate proper const qualifiers for tclUniData.c check-in: d7580c2bee user: nijtmans tags: trunk
14:55
Spacing and comments: let uniClass.tcl generation match better the current (hand-modified) regc_loca... check-in: f147bc4296 user: nijtmans tags: trunk
11:37
* unix/tclUnixSock.c (CreateClientSocket): Fix a memleak and refactor the calls to freeaddrinfo() [B... check-in: 01072bc4cf user: rmax tags: trunk
10:21
Eliminate many tclWinProcs-> indirect calls, which are no longer needed. Fix some MSVC 6.0 warnings check-in: 006b71eced user: nijtmans tags: trunk
2010-10-11
21:33
Update for VS10 check-in: a8d0935cf3 user: nijtmans tags: trunk
12:11
[FRQ 2965056]: Windows build with -DUNICODE Add netapi32 to the windows link line, so we no longer h... check-in: ad9ffc933e user: nijtmans tags: trunk
2010-10-09
17:53
merge check-in: a4dbca26be user: kennykb tags: dogeen-assembler-branch
16:17
fix wrong date in Changelog entry check-in: a5a4aacb45 user: msofer tags: trunk
15:56
* generic/tclExecute.c: fix overallocation of exec stack in TEBC (mixing numwords and numbytes)
check-in: 0c036854c0 user: msofer tags: trunk
2010-10-07
23:36
On Windows, use gai_strerrorA check-in: 6492fa0408 user: nijtmans tags: trunk
2010-10-06
20:21
* tests/winPipe.test: Test hygiene with makeFile and removeFile.
check-in: b907eff7df user: dgp tags: trunk
18:38
* generic/tclCompile.c: Prevent writing to the intrep fields of a * tests/subst.test...
check-in: fdaf2207d9 user: dgp tags: trunk
16:47
Added catches. Still needs a lot of testing. check-in: f242f0858c user: kennykb tags: dogeen-assembler-branch
2010-10-02
16:51
nop and regexp check-in: 0817064f8e user: kennykb tags: dogeen-assembler-branch
16:22
added missing tests: nsupvar, variable, upvar check-in: 39f1a3bc90 user: kennykb tags: dogeen-assembler-branch
16:04
* generic/tclAssembly.c: * generic/tclAssembly.h: * tests/assemble.test: Added dictAppend, dictIncrI... check-in: fb57a61071 user: kennykb tags: dogeen-assembler-branch
12:38
* generic/tclExecute.c (TEBCresume): [Bug 3079830]: Added invalidation of string representations o...
check-in: c764ea06ea user: dkf tags: trunk
11:37
Add function-header comments. check-in: df6fed8608 user: dkf tags: trunk
01:38
merge check-in: e07a7270af user: kennykb tags: dogeen-assembler-branch
00:23
* generic/tclExecute.c (EvalStatsCmd): change 'evalstats' to return data to interp by default, or ...
check-in: 4a9ba46064 user: hobbs tags: trunk
2010-10-01
13:34
merge check-in: 662fc0e6b4 user: kennykb tags: dogeen-assembler-branch
13:20
Added listIn, listNotIn, and dictGet. check-in: 78d6e8ada7 user: kennykb tags: dogeen-assembler-branch
12:52
* generic/tclBasic.c, generic/tclClock.c, generic/tclEncoding.c, * generic/tclEnv.c, generic/tclLo...
check-in: 50bdab4682 user: dkf tags: trunk
2010-09-30
02:48
Merge check-in: 95b8d68eb4 user: kennykb tags: dogeen-assembler-branch
02:42
* tests/assemble.test: Added tryCvtToNumeric and several more list * generic/tclAssemble.c: operat... check-in: 82e6bb3476 user: kennykb tags: dogeen-assembler-branch
02:41
* tests/assemble.test: Added tryCvtToNumeric and several more list * generic/tclAssemble.c: operat... check-in: bd63098c35 user: kennykb tags: dogeen-assembler-branch
2010-09-29
20:04
tclMain.c: make compilable with -DUNICODE as well check-in: d67024d00d user: nijtmans tags: trunk
19:19
re-generate configure with autoconf-2.59 check-in: 5520ee2832 user: nijtmans tags: trunk
03:10
* tests/assemble.test: Completed conversion of tests to a * generic/tclAssemble.c: "white box" str... check-in: aed11a76bf user: kennykb tags: dogeen-assembler-branch
2010-09-28
15:43
merge check-in: 8b2c02cf9f user: kennykb tags: dogeen-assembler-branch
15:22
reverting faulty commit check-in: 145f305da9 user: msofer tags: trunk
15:20
* generic/tclExecute.c: remove TEBCreturn() callback, the job can be accomplished by TEBCresume()
check-in: 50ee8291b2 user: msofer tags: trunk
15:14
Created branch rmax-ipv6-merge-synthetic Closed-Leaf check-in: 202680a12a user: cvs2fossil tags: rmax-ipv6-merge, rmax-ipv6-merge-synthetic
15:14
Implement TIP#162 check-in: bf99e9f86d user: rmax tags: trunk
15:13
  • doc/socket.n: Document the changes to the [socket] and [fconfi...
check-in: 3f8b48b6b6 user: rmax tags: trunk
02:11
* tests/assemble.test: Added more "white box" tests. * generic/tclAssembly.c: Added the error checki... check-in: 43125b50d9 user: kennykb tags: dogeen-assembler-branch
2010-09-27
20:33
Merged from HEAD. Also replaced a funky NRCallTEBC with the new call TclNRExecuteByteCode. check-in: f757862662 user: kennykb tags: dogeen-assembler-branch
20:16
fix error with --enable-symbols=compile check-in: ec71acf2ad user: msofer tags: trunk
19:57
missed ChangeLog entry check-in: 9b7113e2c8 user: msofer tags: trunk
19:42
* generic/tclBasic.c: [Patch 3072080] (minus the itcl * generic/tclCmdIL.c: update): a saner...
check-in: 56c0f34285 user: msofer tags: trunk
17:36
* generic/tclVar.c: use the macro HasLocalVars everywhere
check-in: e2ecd81658 user: msofer tags: trunk
03:08
* tests/assemble.test: Added more "white box" tests. * generic/tclAssembly.c: Fixed bugs exposed by ... check-in: c416d3f6a6 user: kennykb tags: dogeen-assembler-branch
2010-09-26
14:16
* generic/tclOOMethod.c (ProcedureMethodVarResolver): avoid code duplication, let the runtime var ...
check-in: 2f076e63b2 user: msofer tags: trunk
05:37
* tests/assemble.test: Added many new tests moving toward a more comprehensive test suite for the as... check-in: c571b679a7 user: kennykb tags: dogeen-assembler-branch
2010-09-25
17:10
added more tests; fixed a bug in initialization of BasicBlock obj check-in: d2b05ebb0f user: kennykb tags: dogeen-assembler-branch
14:51
* tclAssembly.c: Massive refactoring of the assembler * tclAssembly.h: to use a Tcl-like syntax (a... check-in: 8fa55c35f1 user: kennykb tags: dogeen-assembler-branch
02:25
* tests/stringComp.test: improved string test coverage * generic/tclExecute.c (TclExecuteByteCode)...
check-in: f1d4c3f43e user: hobbs tags: trunk
2010-09-24
17:53
* tclWinsock.c: [Bug 3056775]: Fixed race condition between thread and internal co-thread access ... check-in: 99a1ee3675 user: andreas_kupries tags: trunk
2010-09-23
21:40
Make Tcl_SetPanicProc and Tcl_GetStringResult callable without stubs, just as Tcl_SetVar. check-in: f696973491 user: nijtmans tags: trunk
18:08
* generic/tclCmdAH.c: Fix cases where value returned by * generic/tclEvent.c: Tc...
check-in: b83a3519f5 user: dgp tags: trunk
09:18
Make compilable with -DUNICODE (not actived yet) Many clean-ups in comments. check-in: 87eb553ce4 user: nijtmans tags: trunk
2010-09-22
18:37
* generic/tclExecute: one more DECACHE_STACK_INFO() missing; this fixes [Bug 3072640]
check-in: 1a61d9c34d user: msofer tags: trunk
17:21
* tests/execute.test: added execute-10.3 for [Bug 3072640]. The test causes a mem failure.
check-in: 9637ffa98b user: msofer tags: trunk
15:49
* generic/tclExecute: protect all possible writes to ::errorInfo or ::errorCode with DECACHE_STACK...
check-in: cad1977f01 user: msofer tags: trunk
13:35
Improved readability of tcl+pkgs builds and tests check-in: 0435fd69e4 user: dgp tags: trunk
06:48
Add kernel32 to LIBS, so the link line for mingw is exactly the same as for MSVC++ check-in: f4eb1c2f19 user: nijtmans tags: trunk
01:08
merge changes from HEAD check-in: 4312778f87 user: kennykb tags: dogeen-assembler-branch
00:57
* generic/tclOOMethod.c (ProcedureMethodCompiledVarConnect): * generic/tclVar.c (TclLookupSimpleVa...
check-in: 9dc86adce7 user: hobbs tags: trunk
2010-09-21
21:50
[Bug 3069278]: Breakage on head Windows triggered by install-tzdata, final fix check-in: cd35f6dc9e user: nijtmans tags: trunk
20:22
Fix declaration after statement. Add -Wdeclaration-after-statement, so this mistake cannot happen ag... check-in: 057c64e70b user: nijtmans tags: trunk
19:32
initial commit of Ozgur Dogan Ugurlu's (SF user:dogeen) assembler for the Tcl bytecode language check-in: ddc9909aaa user: kennykb tags: dogeen-assembler-branch
2010-09-20
14:28
Eliminate tclWinProcs->useWide everywhere, since the value is always "1" on platforms >win95 check-in: 078f98cdb5 user: nijtmans tags: trunk, dogeen-assembler-split
2010-09-18
23:14
* doc/file.n (file readlink): [Bug 3070580]: Typofix.
check-in: c634721862 user: dkf tags: trunk
05:56
Oops, didn't mean to check in this file. check-in: 3360f6e2a5 user: nijtmans tags: trunk
05:40
[Bug 3069278]: breakage on head Windows triggered by install-tzdata. Temporary don't compile this w... check-in: 5fc0bc6b95 user: nijtmans tags: trunk
2010-09-16
18:53
* win/tclWinFile.c: remove define of FINDEX_INFO_LEVELS as all supported versions of compilers sho...
check-in: 31663a3d48 user: hobbs tags: trunk
17:49
* unix/Makefile.in: do not pass current build env vars when using NATIVE_TCLSH in targets.
check-in: b0fa6637ec user: hobbs tags: trunk
14:49
Make Tcl_FindExecutable() work in UNICODE compiles (windows-only) as well as ASCII. Needed for [FRQ ... check-in: ec07a95ae4 user: nijtmans tags: trunk
2010-09-15
22:11
* generic/tclBinary.c (TclAppendBytesToByteArray): [Bug 3067036]: Make sure we never try to double...
check-in: 6d28eb4724 user: dkf tags: trunk
16:55
* unix/Makefile.in: Revise `make dist` target to tolerate the case of zero bundl...
check-in: 58c285a5e4 user: dgp tags: trunk
15:49
update file generated by 'make dist' check-in: a1686bf31b user: dgp tags: trunk
07:33
[Patch 3034251] backport ttkGenStubs.tcl features to genStubs.tcl. Make the "generic" argument in th... check-in: 460fd8df0f user: nijtmans tags: trunk
2010-09-14
08:53
Allow all Win2000+ API entries in Tcl Eliminate dynamical loading of advapi23 and kernal32 symbols. check-in: 48bcb44884 user: nijtmans tags: trunk
2010-09-13
21:17
Add scspec feature from ttkGenStubs.tcl (no change in output for *Decls.h files) check-in: 4be7f3d2c5 user: nijtmans tags: trunk
14:20
Various clean-ups, converting from tclWinProc->xxxProc directly to Xxx (no change in functionality) check-in: 18a516cee2 user: nijtmans tags: trunk
2010-09-10
20:56
Partly revert yesterday's change, to make it work on VC++ 6.0 again. check-in: 56f47fed71 user: nijtmans tags: trunk
12:59
* doc/regsub.n: [Bug 3063568]: Fix for gotcha in example due to Tcl's special handling of backslas...
check-in: 02ea8ed280 user: dkf tags: trunk
2010-09-09
14:30
mingw should always link with -ladvapi32 Remove ascii variant of tkWinPocs table, it is no longer ne... check-in: 0d850f32ad user: nijtmans tags: trunk
2010-09-08
21:02
* win/tclWinChan.c: #ifdef protections to permit builds with * win/tclWinFCmd.c: ...
check-in: 5788a6307f user: dgp tags: trunk
16:53
* doc/tm.n: Added underscore to the set of characters accepted in module names. This is true for ... check-in: 70f58d0c67 user: andreas_kupries tags: trunk
2010-09-03
09:38
Start producing HTML out for Thread package. Consequent bugfixes:
* tools/tcltk-man2html.tcl (plus...
check-in: c4a101b562 user: dkf tags: trunk
2010-09-02
19:50
* doc/glob.n: Fixed documentation ambiguity regarding the handling of -join. check-in: 5836ca98cb user: andreas_kupries tags: trunk
18:31
* library/safe.tcl (::safe::AliasGlob): Fixed another problem, the option -join does not stop opt... check-in: ca86a378fa user: andreas_kupries tags: trunk
04:53
* library/safe.tcl (::safe::AliasGlob): Moved the command extending the actual glob command with ... check-in: 887af403c7 user: andreas_kupries tags: trunk
2010-09-01
20:35
* generic/tclExecute.c: [Bug 3057639]. Applied patch by Jeff to * generic/tclVar.c: make the beha... check-in: 405a405dc7 user: andreas_kupries tags: trunk
2010-08-31
20:53
[Patch 2997642] many type casts needed when using Tcl_Pkg* API. Remaining part, doc. check-in: 22e264883a user: nijtmans tags: trunk
20:48
[Patch 2997642] many type casts needed when using Tcl_Pkg* API. Remaining part. Typo in rules.vc check-in: ea7f85f078 user: nijtmans tags: trunk
20:46
* win/tcl.m4: Applied patch by Jeff fixing issues with the manifest handling on Win64. * win/con... check-in: 2ce1308995 user: andreas_kupries tags: trunk
2010-08-30
14:02
* generic/tclBasic.c: New implementation for [tailcall]: * generic/tclCmdAH.c: it now schedu...
check-in: c263c556ad user: msofer tags: trunk
13:56
[Patch 2997642] many type casts needed when using Tcl_Pkg* API. Partly. check-in: 5cab717c7c user: nijtmans tags: trunk
13:49
[Patch 2997642] many type casts needed when using Tcl_Pkg* API. Partly. check-in: 108cf5bef2 user: nijtmans tags: trunk
09:19
[Freq 2965056]: Windows build with -DUNICODE check-in: f5f9877d12 user: nijtmans tags: trunk
2010-08-29
15:37
* doc/dict.n: [Bug 3046999]: Corrected cross reference to array manpage to refer to (correct) exis...
check-in: aa8d4c6db6 user: dkf tags: trunk
2010-08-27
00:53
* unix/configure, unix/tcl.m4: SHLIB_LD_LIBS='${LIBS}' for OSF1-V*. Add /usr/lib64 to set of auto-...
check-in: 1055eb001d user: hobbs tags: trunk
00:50
* win/Makefile.in (VC_MANIFEST_EMBED_DLL VC_MANIFEST_EMBED_EXE): * win/configure, win/configure.in...
check-in: 25e4e9160b user: hobbs tags: trunk
2010-08-25
01:00
[Patch 2994165]: Change signature of Tcl_FSGetNativePath and TclpDeleteFile follow-up: move stub ent... check-in: 64c52eb8b5 user: nijtmans tags: trunk
2010-08-24
06:17
[Bug 3007895] Tcl_(Find|Create)HashEntry stub entries can never be called. check-in: 616c58cab2 user: nijtmans tags: trunk
2010-08-23
20:00
* library/tzdata/Africa/Cairo: * library/tzdata/Asia/Gaza: Olson's tzdata2010l. check-in: a5ed7f585a user: kennykb tags: trunk
2010-08-22
18:53
Remove many type casts which are no longernecessary as a result of [Patch 3009403]: Signature of Tcl... check-in: 0ca694ea65 user: nijtmans tags: trunk
2010-08-21
16:58
* doc/linsert.n: [Bug 3045123]: Make description of what is actually happening more accurate.
check-in: aef0e83c95 user: dkf tags: trunk
16:30
[Patch 3034251]: Backport ttkGenStubs.tcl features to genStubs.tcl, partly: Use void (*reserved$i)(v... check-in: f2adcb5684 user: nijtmans tags: trunk
2010-08-20
23:01
Fix definition of Tcl_MethodType check-in: cc296bd9ea user: nijtmans tags: trunk
2010-08-19
10:07
* generic/tclTrace.c (TraceExecutionObjCmd, TraceCommandObjCmd) (TraceVariableObjCmd): [Patch 3048...
check-in: 8bc231bd37 user: dkf tags: trunk
04:26
[Patch 3034251] backport ttkGenStubs.tcl features to genStubs.tcl, partly: remove unneeded ifdeffery... check-in: 6f6d53c30a user: nijtmans tags: trunk
2010-08-18
22:33
* generic/tclBasic.c: New redesign of [tailcall]: find * generic/tclExecute.c: errors early on, ...
check-in: c73d12f03c user: msofer tags: trunk
15:54
* generic/tclCmdAH.c (TclNRTryObjCmd): block tailcalling out of the body of a non-bc'ed [try], #30...
check-in: 5ec520bacc user: msofer tags: trunk
15:44
* generic/tclBasic.c: Redesign of [tailcall] to * generic/tclCmdAH.c: (a) fix #3047235 * ge...
check-in: beb3af88b5 user: msofer tags: trunk
13:31
* library/safe.tcl (AliasGlob): [Bug 3004191]: Restore safe [glob] to working condition.
check-in: 77440fdac3 user: dkf tags: trunk
2010-08-15
16:12
* generic/tclProc.c (ProcWrongNumArgs): [Bug 3045010]: Make the handling of passing the wrong numb...
check-in: 21917a8b91 user: dkf tags: trunk
2010-08-14
20:58
[Patch 3009403] Signature of Tcl_GetHashKey, Tcl_(Create|Find)HashEntry check-in: 038e8afe83 user: nijtmans tags: trunk
17:13
[Patch #2994165] Change signature of Tcl_FSGetNativePath and TclpDeleteFile check-in: 24edb97f5a user: nijtmans tags: trunk
16:53
Remove mslu completely, see Feature Req #2819611 check-in: 86f59a32d8 user: nijtmans tags: trunk
2010-08-12
00:40
* unix/ldAix: remove ancient (pre-4.2) AIX support * unix/configure: regen with ac-2...
check-in: a466998bba user: hobbs tags: trunk
2010-08-11
23:38
added test for yieldTo check-in: 8305e33b3d user: msofer tags: trunk
23:13
* generic/tclBasic.c (TclNRYieldToObjCmd): fixed bad copypasta snafu. Thanks to Andy Goth for find...
check-in: 0b27a4ca4e user: msofer tags: trunk
2010-08-10
20:48
* generic/tclUtil.c (TclByteArrayMatch): patterns may not be null-terminated, so acc...
check-in: d4f4ee41c5 user: hobbs tags: trunk
20:36
tidy up check-in: 6b4673e42f user: dgp tags: trunk