bzr commit into connector-net-6.3 branch (julio.casal:1008)

[Julio Casal]

#At file:///D:/Users/jcasalt/Dev/connector-net/6.3/ based on revid:julio.casal@stripped

 1008 Julio Casal	2011-06-20 [merge]
      Merged.

    modified:
      MySql.Data/Tests/Source/ConnectionStringBuilder.cs
=== modified file 'MySql.Data/Tests/Source/ConnectionStringBuilder.cs'
--- a/MySql.Data/Tests/Source/ConnectionStringBuilder.cs	2011-05-19 19:59:55 +0000
+++ b/MySql.Data/Tests/Source/ConnectionStringBuilder.cs	2011-06-20 13:20:03 +0000
@@ -98,12 +98,14 @@ namespace MySql.Data.MySqlClient.Tests
             Assert.AreEqual("database=test2", s.ConnectionString);
         }
 
+#if !CF
         [Test]
         public void EncryptKeyword()
         {
             string connStr = "database=test;uid=root;server=localhost;encrypt=yes";
             MySqlConnectionStringBuilder sb = new MySqlConnectionStringBuilder(connStr);
         }
+#endif
 
         /// <summary>
         /// Bug #51209	error on parameter without value on connectionstring

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).