bzr commit into connector-net-6.2 branch (reggie.burnett:898)

[Reggie Burnett]

#At file:///C:/work/connector-net/6.2/ based on revid:reggie.burnett@stripped

  898 Reggie Burnett	2010-09-02 [merge]
      merged

    modified:
      MySql.Data/Provider/Source/common/SHA1.cs
=== modified file 'MySql.Data/Provider/Source/common/SHA1.cs'
=== modified file 'MySql.Data/Provider/Source/common/SHA1.cs'
--- a/MySql.Data/Provider/Source/common/SHA1.cs	2010-08-18 19:48:34 +0000
+++ b/MySql.Data/Provider/Source/common/SHA1.cs	2010-09-02 20:34:25 +0000
@@ -20,6 +20,40 @@
 // with this program; if not, write to the Free Software Foundation, Inc., 
 // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+/*
+  Original Source from: http://www.faqs.org/rfcs/rfc3174.html
+
+  Copyright (C) The Internet Society (2001).  All Rights Reserved.
+
+  This document and translations of it may be copied and furnished to
+  others, and derivative works that comment on or otherwise explain it
+  or assist in its implementation may be prepared, copied, published
+  and distributed, in whole or in part, without restriction of any
+  kind, provided that the above copyright notice and this paragraph are
+  included on all such copies and derivative works.  However, this
+  document itself may not be modified in any way, such as by removing
+  the copyright notice or references to the Internet Society or other
+  Internet organizations, except as needed for the purpose of
+  developing Internet standards in which case the procedures for
+  copyrights defined in the Internet Standards process must be
+  followed, or as required to translate it into languages other than
+  English.
+
+  The limited permissions granted above are perpetual and will not be
+  revoked by the Internet Society or its successors or assigns.
+
+  This document and the information contained herein is provided on an
+  "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+  TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+  BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+  HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+  MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+  Acknowledgement 
+  Funding for the RFC Editor function is currently provided by the 
+  Internet Society. 
+*/
+
 using System;
 
 namespace MySql.Data.Common


Attachment: [text/bzr-bundle] bzr/[e-mail]