First merge of Trond's patches (cherry picking).

[m6w6/libmemcached] / libmemcached / memcached_server.h

diff --git a/libmemcached/memcached_server.h b/libmemcached/memcached_server.h
index e0fc7ea14ba4b7a25ad672ac08fbb535b76389de..f2d92dc1249517776ed1c34d6e1a7d187c5ab62c 100644 (file)
--- a/libmemcached/memcached_server.h
+++ b/libmemcached/memcached_server.h
@@ -1,9 +1,12 @@
-/*
- * Summary: String structure used for libmemcached.
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker 
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
  *
- * Copy: See Copyright for the status of this software.
+ * Summary: String structure used for libmemcached.
  *
- * Author: Brian Aker
  */
 
 #ifndef __MEMCACHED_SERVER_H__