bzr commit into connector-net-trunk branch (reggie.burnett:866)

[Reggie Burnett]

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

  866 Reggie Burnett	2010-04-27 [merge]
      merged

    modified:
      Documentation/help.shfbproj
      MySql.Data/Provider/Properties/AssemblyInfo.cs
      MySql.Data/Provider/Source/ISSchemaProvider.cs
      MySql.Data/Provider/Source/MySqlPacket.cs
      MySql.Data/Provider/Source/common/MySqlTokenizer.cs
=== modified file 'Documentation/help.shfbproj'
=== modified file 'Documentation/help.shfbproj'
--- a/Documentation/help.shfbproj	2010-02-14 22:28:05 +0000
+++ b/Documentation/help.shfbproj	2010-04-27 18:31:24 +0000
@@ -43,7 +43,7 @@
     <RootNamespaceTitle>Reference</RootNamespaceTitle>
     <HelpTitle>MySQL Connector/Net</HelpTitle>
     <CopyrightHref>http://www.mysql.com</CopyrightHref>
-    <CopyrightText>&amp;#169%3b 2004-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc., 2010 Oracle All rights reserved.</CopyrightText>
+    <CopyrightText>Copyright &amp;#169%3b 2004,2010, Oracle and/or its affiliates.  All rights reserved.</CopyrightText>
     <FeedbackEMailAddress>support%40mysql.com</FeedbackEMailAddress>
     <PresentationStyle>vs2005</PresentationStyle>
     <NamingMethod>MemberName</NamingMethod>

=== modified file 'MySql.Data/Provider/Properties/AssemblyInfo.cs'
--- a/MySql.Data/Provider/Properties/AssemblyInfo.cs	2010-03-08 21:29:40 +0000
+++ b/MySql.Data/Provider/Properties/AssemblyInfo.cs	2010-04-27 18:31:24 +0000
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2007 MySQL AB
+// Copyright ⌐ 2004,2010, Oracle and/or its affiliates.  All rights reserved.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as published by

=== modified file 'MySql.Data/Provider/Source/ISSchemaProvider.cs'
--- a/MySql.Data/Provider/Source/ISSchemaProvider.cs	2010-04-21 17:38:12 +0000
+++ b/MySql.Data/Provider/Source/ISSchemaProvider.cs	2010-04-27 18:30:06 +0000
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+// Copyright ⌐ 2004,2010, Oracle and/or its affiliates.  All rights reserved.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as published by

=== modified file 'MySql.Data/Provider/Source/MySqlPacket.cs'
--- a/MySql.Data/Provider/Source/MySqlPacket.cs	2010-04-21 17:47:38 +0000
+++ b/MySql.Data/Provider/Source/MySqlPacket.cs	2010-04-27 18:31:24 +0000
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+∩╗s affiliates.  All rights reserved.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as published by

=== modified file 'MySql.Data/Provider/Source/common/MySqlTokenizer.cs'
--- a/MySql.Data/Provider/Source/common/MySqlTokenizer.cs	2010-04-10 01:40:44 +0000
+++ b/MySql.Data/Provider/Source/common/MySqlTokenizer.cs	2010-04-27 18:31:24 +0000
@@ -1,4 +1,4 @@
-// Copyright (c) 2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+// Copyright ⌐ 2004,2010, Oracle and/or its affiliates.  All rights reserved.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as published by

Attachment: [text/bzr-bundle]