# HG changeset patch
# User pingooo
# Date 1288099684 -28800
# Node ID d2863fa9720b147e86cd662231504e30f89abfc8
# Parent  92a97858c7e36f272bc75c094c7e72dfced23eb6# Parent  b8c3a8fc32d07b3f726e0c3f5df26e8d4237a1c1
Merge from head.

diff -r 92a97858c7e3 -r d2863fa9720b COPYING.h
--- a/COPYING.h	Tue Oct 26 21:26:40 2010 +0800
+++ b/COPYING.h	Tue Oct 26 21:28:04 2010 +0800
@@ -12,7 +12,7 @@
  * 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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *