Merge ASDF changes

diff --combined cl-base64.asd
index 59a3e6b5338490cc8a501e2fc240d1029dc87773,1fcb683732248c00e3954904fb6d3a1c8c80af38..74a3a25f314214988df9ca25bae7732dcb45afa9
--- 1/cl-base64.asd
--- 2/cl-base64.asd
+++ b/cl-base64.asd
@@@ -6,32 -6,32 +6,30 @@@
  ;;;; Purpose:       ASDF definition file for Cl-Base64
  ;;;; Programmer:    Kevin M. Rosenberg
  ;;;; Date Started:  Dec 2002
- ;;;;
  ;;;; *************************************************************************
  
  (in-package #:cl-user)
  (defpackage #:cl-base64-system (:use #:asdf #:cl))
  (in-package #:cl-base64-system)
  
--
  (defsystem cl-base64
    :name "cl-base64"
    :author "Kevin M. Rosenberg based on initial code by Juri Pakaste"
 -  :version "3.1"
 +  :version "3.4"
    :maintainer "Kevin M. Rosenberg <kmr@debian.org>"
    :licence "BSD-style"
    :description "Base64 encoding and decoding with URI support."
    :components
    ((:file "package")
     (:file "encode" :depends-on ("package"))
 -   (:file "decode" :depends-on ("package"))
 -   )
 +   (:file "decode" :depends-on ("package")))
-   :in-order-to ((test-op (test-op "cl-base64/test"))))
+   :in-order-to ((test-op (test-op "cl-base64/tests"))))
  
 -(defsystem cl-base64/tests
 +(defsystem cl-base64/test
      :depends-on (cl-base64 ptester kmrcl)
      :components
      ((:file "tests"))
      :perform (test-op (o s)
                        (or (funcall (intern (symbol-name '#:do-tests)
 -                                           (find-package '#:cl-base64-tests)))
 +                                           (find-package '#:cl-base64/test)))
                            (error "test-op failed"))))