bzr push into mysql-5.5 branch (sunanda.menon:4147 to 4148)

[Sunanda Menon]

 4148 Balasubramanian Kandasamy	2013-01-16
      Removed Conflicts: mysql-libs mysql-libs-advanced from spec file

    modified:
      support-files/mysql.spec.sh
 4147 Bjorn Munch	2013-01-15
      A bit more intelligent processing of .in files in mysql-test/collections

    modified:
      .bzrignore
      mysql-test/CMakeLists.txt
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2012-10-01 09:29:02 +0000
+++ b/support-files/mysql.spec.sh	2013-01-16 07:09:26 +0000
@@ -370,7 +370,6 @@ For a description of MySQL see the base
 Summary:	MySQL - Shared libraries
 Group:		Applications/Databases
 Provides:	MySQL-shared
-Conflicts:	mysql-libs mysql-libs-advanced
 Obsoletes:	MySQL-shared-standard MySQL-shared-pro
 Obsoletes:	MySQL-shared-pro-cert MySQL-shared-pro-gpl
 Obsoletes:	MySQL-shared-pro-gpl-cert MySQL-shared

No bundle (reason: useless for push emails).