svn commit: r194794 - head/lib/libutil

[Xin LI]

Author: delphij
Date: Tue Jun 23 23:27:35 2009
New Revision: 194794
URL: http://svn.freebsd.org/changeset/base/194794

Log:
  Merge NetBSD revision 1.14: humanize_number.c is now 2-clause BSD licensed.
  (humanize_number.3 intentionally hold back until I make sure why we didn't
  merged dehumanize_number(3)).
  
  Obtained from:	NetBSD

Modified:
  head/lib/libutil/humanize_number.c

Modified: head/lib/libutil/humanize_number.c
==============================================================================
--- head/lib/libutil/humanize_number.c	Tue Jun 23 23:20:09 2009	(r194793)
+++ head/lib/libutil/humanize_number.c	Tue Jun 23 23:27:35 2009	(r194794)
@@ -1,4 +1,4 @@
-/*	$NetBSD: humanize_number.c,v 1.13 2007/12/14 17:26:19 christos Exp $	*/
+/*	$NetBSD: humanize_number.c,v 1.14 2008/04/28 20:22:59 martin Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -16,13 +16,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the NetBSD
- *      Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED