fix conflicts

diff --combined ChangeLog
index a717b52895d506bc291119acad1f3bbdb68ccc64,054ba371e2c338708aafc7aee1837e290e5d807e..e07a5f97f7e873e44de11e78a2d020f3bbc55019
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,12 +1,16 @@@
- 28 Jun 2008  Kevin Rosenberg <kevin@rosenberg.net>
-       * Version 1.96
++28 Jan 2008  Kevin Rosenberg <kevin@rosenberg.net>
++      * Version 1.98
 +      * {datetime,strings,tests}.lisp: Add remove-char-string
 +
+ 18 Sep 2007  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 1.97
+       * datetime.lisp: Improve output format for date-string
+ 
+ 10 Sep 2007  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 1.96
+       * byte-stream.lisp: Use without-package-locks as suggested
+       by Daniel Gackle.       
+ 
  01 Jun 2007  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 1.95
        * {datetime,package}.lisp: Add day-of-week and pretty-date-ut

diff --combined datetime.lisp
index 348cf58c60a0f8453cdbc0b672d2fafe8758b297,dd813c46f75cb7fc0bef7166d0fcc51ba5a1e6bb..30c815c9d01d5bf482e084c5c6ee6ed8b9c0dd7d
--- 1/datetime.lisp
--- 2/datetime.lisp
+++ b/datetime.lisp
@@@ -40,12 -40,12 +40,12 @@@
    (multiple-value-bind (sec min hr dy mn yr) (decode-universal-time tm)
      (pretty-date yr mn dy hr min sec)))
  
 -(defun date-string (ut)
 +(defun date-string (&optional (ut (get-universal-time)))
    (if (typep ut 'integer)
        (multiple-value-bind (sec min hr day mon year dow daylight-p zone)
            (decode-universal-time ut)
          (declare (ignore daylight-p zone))
-         (format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~], ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d"
+         (format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~] ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d"
                  dow
                  day
                  (1- mon)