xserver: Branch 'master'

[Daniel Stone]

 COPYING |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 64387c8573ca8b3909667e32d7a9fba9567b21d3
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Tue Sep 23 19:05:14 2008 +0300

    Update COPYING for SHA1 code

diff --git a/COPYING b/COPYING
index 6faa4b1..30822e4 100644
--- a/COPYING
+++ b/COPYING
@@ -2597,3 +2597,11 @@ FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
 THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+The following statement applies only to the SHA1 code in render/:
+'SHA-1 in C
+By Steve Reid <steve at edmweb.com>
+100% Public Domain'
+