Merge 4.2p1 to the trunk.

1 files changed, 2 insertions, 0 deletions

diff --git a/LICENCE b/LICENCE
index ae03eb3a7..ac3634f22 100644
--- a/LICENCE
+++ b/LICENCE
@@ -204,6 +204,7 @@ OpenSSH contains no GPL code.
         William Jones
         Darren Tucker
         Sun Microsystems
+        The SCO Group
 
      * Redistribution and use in source and binary forms, with or without
      * modification, are permitted provided that the following conditions
@@ -255,6 +256,7 @@ OpenSSH contains no GPL code.
         Damien Miller
         Eric P. Allman
         The Regents of the University of California
+        Constantin S. Svintsoff
 
         * Redistribution and use in source and binary forms, with or without
         * modification, are permitted provided that the following conditions