| 0ed36a2 | cvs2svn | 05 February 1997, 04:29:55 UTC | This commit was manufactured by cvs2svn to create tag 'RELENG_2_1_6_1_RELEASE'. | 05 February 1997, 04:29:55 UTC |
| 66be732 | Joerg Wunsch | 24 November 1996, 09:31:43 UTC | Merge the Makefile changes from -current that allow to build both versions, the DES-contaminated and the exportable one, during a `make release'. This should fix the problems where /sbin/init and /bin/ed have been missing in the `des' distribution of 2.1.6. Requested by: jkh Reviewed by: markm | 24 November 1996, 09:31:43 UTC |
| c4f9069 | Jordan K. Hubbard | 24 November 1996, 09:01:52 UTC | Update docs to indicate that this is 2.1.6.1 | 24 November 1996, 09:01:52 UTC |
| 932dc7a | David Greenman | 24 November 1996, 00:19:47 UTC | Fixed bug that could lead to pmap corruption during asynchronous page cleans and then cause a panic or worse. Submitted by: dyson and wcarchive | 24 November 1996, 00:19:47 UTC |
| 4f2947c | Satoshi Asami | 23 November 1996, 09:56:54 UTC | Merge 1.4->1.5 diff from -current. Fixes g flag of :S modifier, courtesy of Adam David. We need this for the latest bsd.port.mk to have any chance working. Approved by: jkh | 23 November 1996, 09:56:54 UTC |
| 6c3ae26 | Jordan K. Hubbard | 23 November 1996, 05:12:21 UTC | [I'm still at COMDEX, but this is an easy commit] David and I talked for quite awhile today about how to differentiate 2.1.6 from the "service patched" 2.1.6, and while the packaging can and should stay the same, we still need to know version information in bug reports. I'm therefore bumping the version to 2.1.6.1, though I hope we won't need to refer to it often as such since the 2.1.6 CD will be, in fact, 2.1.6.1 and I intend to also replace the FTP release with it. 2.1.6a and 2.1.7 were also debated and rejected. This version number is the only one we've precedent for (1.1.5.1). | 23 November 1996, 05:12:21 UTC |
| 7f96dcf | Bill Fenner | 22 November 1996, 18:07:52 UTC | Fix previous commit. The patch was appropriate for 4.9.4 but needed a little tweak for 4.9.3. | 22 November 1996, 18:07:52 UTC |
| 767548a | Paul Traina | 22 November 1996, 09:01:35 UTC | Back out rexecd security patch (see note in HEAD) | 22 November 1996, 09:01:35 UTC |
| 3341a38 | Nate Williams | 22 November 1996, 05:42:40 UTC | Merge-O-Matic. Bring in the more secure 8.8.3 sources onto the soon to be dead stable branch in order to have them be part of the 2.1.6a 'security update'. Reviewed by: Tom Samplonius <tom@uniserve.com> | 22 November 1996, 05:42:40 UTC |
| 8d01bbe | Paul Traina | 20 November 1996, 22:25:57 UTC | Disable certain commands before login. | 20 November 1996, 22:25:57 UTC |
| 6469ba7 | Paul Traina | 20 November 1996, 22:25:39 UTC | Merge from head | 20 November 1996, 22:25:39 UTC |
| 4df5080 | Paul Traina | 20 November 1996, 21:44:09 UTC | Sync with HEAD for 2.1.6 PSU1 | 20 November 1996, 21:44:09 UTC |
| d0d0cd6 | Paul Traina | 20 November 1996, 18:36:37 UTC | Merge in 1.11 from the main branch for 2.1.6 (SPU1) | 20 November 1996, 18:36:37 UTC |
| 920c5a5 | Paul Traina | 20 November 1996, 18:25:30 UTC | Syn-flood fix (for service pack update 1) | 20 November 1996, 18:25:30 UTC |
| b7ecbf3 | Peter Wemm | 18 November 1996, 07:12:49 UTC | fix my previous commit here.. I broke the branch compile with a linker error due to an undefined function that exists in 8.8 but not 8.7. Pointed out by: rgrimes | 18 November 1996, 07:12:49 UTC |
| 63b5528 | Bill Fenner | 17 November 1996, 02:43:29 UTC | In C, variable declarations are illegal except at the beginning of a block, even if newer GCC lets you get away with it. Case labels do not begin a block, so I added a block around the code that requires the new variable. | 17 November 1996, 02:43:29 UTC |
| bc3217c | Peter Wemm | 16 November 1996, 16:48:39 UTC | adapt rev 1.8 to sendmail-8.7 as in -stable | 16 November 1996, 16:48:39 UTC |
| 1f2aed8 | Jordan K. Hubbard | 15 November 1996, 23:40:41 UTC | Fix various bogons which could cause searches for the console device to run off a cliff. Submitted-By: Don Lewis <Don.Lewis@tsc.tdk.com> | 15 November 1996, 23:40:41 UTC |
| 035d952 | Peter Wemm | 15 November 1996, 18:57:36 UTC | Bring in rev 1.8 (don't accumulate unnecessary commas at the end of the gecos string) and rev 1.9 (don't return pointers to strings on the stack in struct passwd). | 15 November 1996, 18:57:36 UTC |
| 71de187 | Jordan K. Hubbard | 15 November 1996, 18:44:20 UTC | Merge BOCA comments from HEAD. | 15 November 1996, 18:44:20 UTC |
| 5c95d41 | Jordan K. Hubbard | 15 November 1996, 17:54:18 UTC | Fix minor typo in release notes. Submitted-By: Don Lewis <Don.Lewis@tsc.tdk.com> | 15 November 1996, 17:54:18 UTC |
| a2c42d1 | Jordan K. Hubbard | 15 November 1996, 08:20:00 UTC | This file is just too darn easy to forget about. Bump to 2.1.6-RELEASE and projected release date of December 1996. 2.2-RELEASE's projected date is January 1997. | 15 November 1996, 08:20:00 UTC |
| ccb2511 | Jordan K. Hubbard | 15 November 1996, 08:10:10 UTC | Move TRUE/FALSE outside of #ifdef (as in HEAD). | 15 November 1996, 08:10:10 UTC |
| cfbe6a2 | Jordan K. Hubbard | 14 November 1996, 16:24:34 UTC | Merge. | 14 November 1996, 16:24:34 UTC |
| bea32d8 | Jordan K. Hubbard | 14 November 1996, 15:55:40 UTC | Merge lea change from HEAD. | 14 November 1996, 15:55:40 UTC |
| 586c653 | Jordan K. Hubbard | 14 November 1996, 14:21:44 UTC | Incorporate some more fixes for floppy auto-sizing from Don. Submitted-By: Don Lewis <Don.Lewis@tsc.tdk.com> | 14 November 1996, 14:21:44 UTC |
| 9e9cedc | Satoshi Asami | 14 November 1996, 11:42:14 UTC | Mergetate. | 14 November 1996, 11:42:14 UTC |
| 287e738 | Jordan K. Hubbard | 14 November 1996, 02:03:52 UTC | Replace vi with ed on fixit floppy - we're out of space for it and `ee' on the boot floppy already provides a screen editor anyway (not the best, but hey - what do you expect for 1.2MB?). Just getting this off my TODO list, in case this is ever picked up again. | 14 November 1996, 02:03:52 UTC |
| e1acfbc | Jordan K. Hubbard | 13 November 1996, 13:15:45 UTC | Since we're not using disklabel's cute cloning feature in 2.1.6, use a prototype of "auto" instead. Submitted-By: Don Lewis <Don.Lewis@tsc.tdk.com> | 13 November 1996, 13:15:45 UTC |
| 5f62e55 | Jordan K. Hubbard | 13 November 1996, 12:07:38 UTC | Merge from HEAD. | 13 November 1996, 12:07:38 UTC |
| 090743a | Jordan K. Hubbard | 13 November 1996, 12:03:17 UTC | Merge more robust userconfig selection behavior from -current. | 13 November 1996, 12:03:17 UTC |
| 4221328 | Jordan K. Hubbard | 13 November 1996, 11:58:29 UTC | Bump BOOTMFSSIZE again on advice from Don (I'm working on 2.2 right now so my 2.1.6 builds are somewhat lagging). Also take out the debugging info flag as a default in doFS.sh | 13 November 1996, 11:58:29 UTC |
| dd36d99 | Satoshi Asami | 13 November 1996, 11:42:57 UTC | Merge from -current. | 13 November 1996, 11:42:57 UTC |
| fb08aa3 | Jordan K. Hubbard | 12 November 1996, 22:32:35 UTC | Bruce's suggestion with disklabel and MFS size bump. | 12 November 1996, 22:32:35 UTC |
| 039c9a4 | Stefan Esser | 12 November 1996, 22:20:22 UTC | Fix PCI to PCI bridge register bit field masks. Thanks to "Mike Durian" <durian@plutotech.com> for the very good problem report and his support as a beta tester of this patch. | 12 November 1996, 22:20:22 UTC |
| 411bb32 | Jordan K. Hubbard | 12 November 1996, 18:43:06 UTC | Merge r1.140 | 12 November 1996, 18:43:06 UTC |
| 14f5bf5 | Jordan K. Hubbard | 12 November 1996, 18:20:53 UTC | Update to version 3.8a. Requested-By: Bill Fenner <fenner@freefall.freebsd.org> | 12 November 1996, 18:20:53 UTC |
| 9474805 | Jordan K. Hubbard | 12 November 1996, 17:31:31 UTC | Fix the ipfw LKM. Submitted-By: jc@irbs.com (John Capo) | 12 November 1996, 17:31:31 UTC |
| f6af7ab | Jordan K. Hubbard | 12 November 1996, 13:44:27 UTC | Continue my work merging the unmerged. | 12 November 1996, 13:44:27 UTC |
| 2616909 | Jordan K. Hubbard | 12 November 1996, 12:43:39 UTC | [cry, wail, scream] I thought I *merged* this already! I even remember fixing the exact same things I just fixed this time. Sigh. Maybe I just dreamed it. Anyway, this would more than explain my floppy build problems. :-( If anyone wants me, I'll be in the corner wearing the orange traffic cone. | 12 November 1996, 12:43:39 UTC |
| 3b5dc57 | David Greenman | 12 November 1996, 08:43:32 UTC | Killed "unknown protocol" printf. | 12 November 1996, 08:43:32 UTC |
| 214a12b | Jordan K. Hubbard | 11 November 1996, 22:32:04 UTC | Merge r1.6. Requested-By: bde | 11 November 1996, 22:32:04 UTC |
| 43499b4 | Jordan K. Hubbard | 11 November 1996, 16:07:43 UTC | Staple RELEASETAG since it's always the same for this branch. Go back to previous method of specifying vi's location for 2.1 in fixit floppy (ugh). | 11 November 1996, 16:07:43 UTC |
| b855ae6 | Jordan K. Hubbard | 11 November 1996, 14:15:08 UTC | Bump Mr. Snake to 2.1.6. | 11 November 1996, 14:15:08 UTC |
| 4096915 | Jordan K. Hubbard | 10 November 1996, 20:44:59 UTC | Whoops, merge the Makefile too! :-} | 10 November 1996, 20:44:59 UTC |
| de882f6 | Jordan K. Hubbard | 10 November 1996, 19:12:48 UTC | Incorporate part of the XT_KEYBOARD change that Nate missed. Please be more careful when modifying code in this branch! If my 8 hour release build had died (and it would have, in a few more hours) because of this, I'd have been displeased. :) | 10 November 1996, 19:12:48 UTC |
| 3ec2da7 | Nate Williams | 10 November 1996, 16:57:43 UTC | From -current: Allow us to enable the 'XT_KEYBOARD' code using a configuration flag. This allows the user to add modify syscons's configuration flags using UserConfig that will allow older/quirky hardware (most notably older IBM ThinkPad laptops) to work with the standard boot kernel. (note: I used the same flag as in -current so the documentation would be the same) Inspired by: The Nomads | 10 November 1996, 16:57:43 UTC |
| 6321169 | David Greenman | 10 November 1996, 13:36:46 UTC | Put the packet error printf inside #ifdef DIAGNOSTIC. | 10 November 1996, 13:36:46 UTC |
| f243991 | Jordan K. Hubbard | 10 November 1996, 13:14:49 UTC | Another merge from HEAD before rolling a 2.1.6 release candidate (Tuesday is still the cut-off date for bug fixes!). | 10 November 1996, 13:14:49 UTC |
| 9bf0fb3 | Jordan K. Hubbard | 10 November 1996, 13:11:30 UTC | Merge r1.24 from HEAD (good idea). | 10 November 1996, 13:11:30 UTC |
| 4c89cc9 | Jordan K. Hubbard | 10 November 1996, 12:45:04 UTC | Bring in Joerg's changes from the HEAD. | 10 November 1996, 12:45:04 UTC |
| 35bd429 | David Greenman | 10 November 1996, 12:32:35 UTC | Updated to a newer version from Matt Thomas. This is the same version that -current is based on. This has been tested on wcarchive for about 12 hours and in -current for a couple of months. This update should fix many of the compatibility problems that people have reported. | 10 November 1996, 12:32:35 UTC |
| 98fbe99 | Satoshi Asami | 10 November 1996, 11:21:15 UTC | Put ccd in the right place. Sorry about the screwup. Reported by: Andre Albsmeier <Andre.Albsmeier@mchp.siemens.de> | 10 November 1996, 11:21:15 UTC |
| 47f9b12 | Jordan K. Hubbard | 09 November 1996, 21:04:03 UTC | Merge Makefile fix, an old disks.c fix which somehow didn't get in and kill the mysterious extra copy of keymap.c appended to itself. | 09 November 1996, 21:04:03 UTC |
| 85a0701 | Jordan K. Hubbard | 09 November 1996, 20:32:26 UTC | Commit a saner version of this without so much disklabel trickery. I'll stick to the old way of doing things for 2.1. | 09 November 1996, 20:32:26 UTC |
| 1e00e82 | Jordan K. Hubbard | 09 November 1996, 20:21:47 UTC | Back out previous change - I don't think it's necessary now that Poul's shown me the real culprit is rawboot. | 09 November 1996, 20:21:47 UTC |
| 7892cf0 | Jordan K. Hubbard | 09 November 1996, 09:26:44 UTC | Merge in Bruce's cleanups from HEAD. | 09 November 1996, 09:26:44 UTC |
| 9890c49 | Jordan K. Hubbard | 09 November 1996, 09:23:25 UTC | Merge | 09 November 1996, 09:23:25 UTC |
| 67ece4f | Jordan K. Hubbard | 09 November 1996, 08:41:50 UTC | Merge r1.83 Requested-By: se | 09 November 1996, 08:41:50 UTC |
| 5059764 | Guido van Rooij | 08 November 1996, 21:49:52 UTC | Retrofit rwhod security patches. | 08 November 1996, 21:49:52 UTC |
| 5991847 | Guido van Rooij | 08 November 1996, 21:40:16 UTC | Retrofit rwhod security patches. | 08 November 1996, 21:40:16 UTC |
| 53293da | Jordan K. Hubbard | 08 November 1996, 18:31:47 UTC | Bring in asprintf*() prototypes from HEAD. | 08 November 1996, 18:31:47 UTC |
| f1bbfa8 | Jordan K. Hubbard | 08 November 1996, 13:39:42 UTC | Merge revision 1.23 from HEAD. Requested-By: bde | 08 November 1996, 13:39:42 UTC |
| a0a9d32 | Jordan K. Hubbard | 08 November 1996, 13:26:32 UTC | Another distribute target fix. Submitted-By: Don Lewis <Don.Lewis@tsc.tdk.com> | 08 November 1996, 13:26:32 UTC |
| 1764b4a | Jordan K. Hubbard | 08 November 1996, 12:56:36 UTC | Wow, make the vmstat display actually usable! This is a cosmetic fix, but low-impact and worth the comeasurate risk. I [jkh] can't even test it in -current since systat's vmstat display is completely broken there at the moment, printing out: "The alternate system clock has died!" Submitted-By: Heiko Blume <src@NS.Contrib.Com> | 08 November 1996, 12:56:36 UTC |
| 9eb930f | Jordan K. Hubbard | 08 November 1996, 09:30:44 UTC | Adapt to gcc 2.6.3 and bring one change across from HEAD. | 08 November 1996, 09:30:44 UTC |
| 18847af | Jordan K. Hubbard | 08 November 1996, 06:33:38 UTC | Add bsd.kern.mk | 08 November 1996, 06:33:38 UTC |
| 253a0ab | Jordan K. Hubbard | 08 November 1996, 06:09:44 UTC | include distribute target. Submitted-By: Don Lewis <Don.Lewis@tsc.tdk.com> | 08 November 1996, 06:09:44 UTC |
| 6c90d67 | Jordan K. Hubbard | 08 November 1996, 06:08:10 UTC | Build c++rt0.o before libg++, just as in -current. Pointed-Out-By: Don Lewis <Don.Lewis@tsc.tdk.com> | 08 November 1996, 06:08:10 UTC |
| 741fb6a | Jordan K. Hubbard | 08 November 1996, 06:05:11 UTC | Remove an extraneous malloc() definition. Submitted-By: Don Lewis <Don.Lewis@tsc.tdk.com> | 08 November 1996, 06:05:11 UTC |
| 92c73bf | Jordan K. Hubbard | 08 November 1996, 05:21:01 UTC | Yikes! Add rawboot. Thanks-for-the-reminder-to: Don Lewis <Don.Lewis@tsc.tdk.com> | 08 November 1996, 05:21:01 UTC |
| 9b4af82 | Bill Paul | 08 November 1996, 02:06:30 UTC | - Make _yp_unbind() check for a NULL RPC client handle before calling clnt_destroy(). - Let yp_order() handle RPC_PROCUNAVAIL that might be returned from NIS+ servers in YP compat mode gracefully. 2.1.6 candidate | 08 November 1996, 02:06:30 UTC |
| 8f4e080 | Bruce Evans | 07 November 1996, 17:53:06 UTC | Brought in fixes from rev.1.146 - don't write to the divisor latch registers unnecessarily, etc. | 07 November 1996, 17:53:06 UTC |
| 0bb3003 | Jordan K. Hubbard | 07 November 1996, 14:19:31 UTC | Merge from head. | 07 November 1996, 14:19:31 UTC |
| d0df788 | Wolfram Schneider | 07 November 1996, 12:44:43 UTC | merge | 07 November 1996, 12:44:43 UTC |
| bef8647 | Jordan K. Hubbard | 07 November 1996, 09:26:32 UTC | Bring new screen map in from HEAD. | 07 November 1996, 09:26:32 UTC |
| 1686db7 | Jordan K. Hubbard | 07 November 1996, 09:18:15 UTC | Merge from HEAD. | 07 November 1996, 09:18:15 UTC |
| 4ac3d04 | Satoshi Asami | 07 November 1996, 05:37:05 UTC | Merge rev. 1.2 from HEAD. Make xargs take into account the bytes occupied by the environment. | 07 November 1996, 05:37:05 UTC |
| 71c9e6d | Satoshi Asami | 07 November 1996, 04:14:22 UTC | Merge with -current. | 07 November 1996, 04:14:22 UTC |
| 8d77f48 | cvs2svn | 06 November 1996, 22:49:50 UTC | This commit was manufactured by cvs2svn to create branch 'RELENG_2_1_0'. | 06 November 1996, 22:49:50 UTC |
| ac69170 | Joerg Wunsch | 06 November 1996, 17:34:25 UTC | Fix my broken config entries for the `od' driver in the !NEW_SCSICONF case. I've accidentally copied over the NEW_SCSICONF entries there, which was totally bogus. Closes PR #kern/1829: KONICA MO drive config... Submitted by: akiyama@kme.mei.co.jp (Shunsuke Akiyama) | 06 November 1996, 17:34:25 UTC |
| 79392cd | John Polstra | 06 November 1996, 17:05:30 UTC | Bring libz into the RELENG_2_1_0 branch. | 06 November 1996, 17:05:30 UTC |
| c4c559f | Joerg Wunsch | 06 November 1996, 12:42:11 UTC | Disable the `worm' driver for 2.1.6. It doesn't work with the popluar HP drives, and now that 2.2 is around the corner, there's no need to also include the required patch to the SCSI subsystem into 2.1.6. | 06 November 1996, 12:42:11 UTC |
| 3e08be9 | John Polstra | 05 November 1996, 22:29:52 UTC | Merge from HEAD 1.23 -> 1.24: Fix spelling error. | 05 November 1996, 22:29:52 UTC |
| 19936eb | Guido van Rooij | 04 November 1996, 22:17:20 UTC | New vx driver for: 3COM 3C590 Etherlink III PCI, 3COM 3C595 Fast Etherlink PCI, 3COM 3C592 Etherlink III EISA, 3COM 3C590 Fast Etherlink EISA, 3COM 3C900 Etherlink XL PCI and 3COM 3C905 Fast Etherlink XL PCI. This driver is based on OpenBSD's driver. I modified it to run under FreeBSd and made it actually work usefully. Afterwards, nao@tom-yam.or.jp (HAMADA Naoki) added EISA support as well as early support for 3C900 Etherlink XL PCI and 3C905 Fast Etherlink XL PCI. He also split up the driver in a bus independant and bus dependant parts. Especially the 3c59X support should be pretty stable now. Submitted by: partly nao@tom-yam.or.jp (HAMADA Naoki) Obtained from:partly OpenBSD | 04 November 1996, 22:17:20 UTC |
| 79216c3 | Jordan K. Hubbard | 04 November 1996, 18:28:57 UTC | As requested by bde: Should be in 2.1.5 and 2.2. Revision Changes Path 1.22 +10 -6 src/sys/i386/isa/diskslice_machdep.c | 04 November 1996, 18:28:57 UTC |
| 6e644d9 | Jordan K. Hubbard | 04 November 1996, 18:26:47 UTC | As requested by bde: These fixes should be in 2.1.6 and 2.2. Revision Changes Path 1.42 +30 -6 src/sys/ufs/ufs/ufs_vnops.c | 04 November 1996, 18:26:47 UTC |
| ca639d2 | Jordan K. Hubbard | 04 November 1996, 17:44:23 UTC | merge-o-tron | 04 November 1996, 17:44:23 UTC |
| 2873bf3 | Marc G. Fournier | 04 November 1996, 14:47:09 UTC | Merge in a patch from 2.2-CURRENT for OpenTunnel Close PR# bin/1316 Reviewed by: J Wunsch <j@uriah.heep.sax.de> | 04 November 1996, 14:47:09 UTC |
| e89df47 | Jordan K. Hubbard | 04 November 1996, 13:08:58 UTC | merge-o-matic. I may have to update some packages in 2.1.6 myself if it comes down to it, but not that many. BTW, in case it's not obvious, I'm mostly merging away in -stable while phk and joerg do the 2.2-current merging for now. I'm getting 2.1.6 out of the way so that I can concentrate on 2.2. | 04 November 1996, 13:08:58 UTC |
| 2c8b11f | Jordan K. Hubbard | 03 November 1996, 21:35:08 UTC | A more acceptible hybrid of 2.2's and 2.1's versions. May still need to pull in some of Bruce's changes to make /dev/vn0c work as it should. | 03 November 1996, 21:35:08 UTC |
| b2f60ec | Jordan K. Hubbard | 03 November 1996, 11:55:49 UTC | Whoops, forgot to prune -lipx from this file. | 03 November 1996, 11:55:49 UTC |
| 43f2e54 | Jordan K. Hubbard | 03 November 1996, 06:22:58 UTC | d'oh! Forgot about the cvs -d stuff, *again*. | 03 November 1996, 06:22:58 UTC |
| 1b63380 | Jordan K. Hubbard | 03 November 1996, 06:02:33 UTC | Set RELEASETAG by default, since there's no reason not to. | 03 November 1996, 06:02:33 UTC |
| fc417b4 | Jordan K. Hubbard | 03 November 1996, 05:48:18 UTC | 2nd try - sync up and try to produce a working -stable release build. | 03 November 1996, 05:48:18 UTC |
| 4bbb04f | Jordan K. Hubbard | 03 November 1996, 05:34:00 UTC | Remove extraneous copies of vasprintf(). | 03 November 1996, 05:34:00 UTC |
| 754e3d2 | Jordan K. Hubbard | 03 November 1996, 05:28:16 UTC | Sync up vasprintf() support with -current. | 03 November 1996, 05:28:16 UTC |
| bee43e8 | Jordan K. Hubbard | 03 November 1996, 05:23:45 UTC | Moved to libc, as with -current. | 03 November 1996, 05:23:45 UTC |
| c8c9377 | Warner Losh | 01 November 1996, 18:47:57 UTC | Backport rev 1.3 and 1.2 which implemented -0 to -stable branch. Reviewed by: Warner Losh <imp@village.org> Submitted by: Marc Slemko <marcs@znep.com> Obtained from: OpenBSD | 01 November 1996, 18:47:57 UTC |
| 5f097b7 | Warner Losh | 01 November 1996, 04:57:52 UTC | Back port OpenBSD of 961025 merge in -current to -stable | 01 November 1996, 04:57:52 UTC |
