[mysql/f17: 27/27] Merge branch 'f18' into f17

[Honza Horak]

commit d5521ba9caafdfa6df6ae2989758857b39854aaf
Merge: ed333da f32fc57
Author: Honza Horák <hhorak at redhat.com>
Date:   Tue Feb 12 19:13:28 2013 +0100

    Merge branch 'f18' into f17
    
    Conflicts:
    	.gitignore
    	mysql.spec
    	sources

 .gitignore |    2 +-
 mysql.spec |   54 ++++++++++++++++++++++++++++++++++++++++++------------
 sources    |    2 +-
 3 files changed, 44 insertions(+), 14 deletions(-)
---
diff --cc .gitignore
index a7f3c6c,d15a15f..84390da
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/mysql-5.5.29-nodocs.tar.gz
+ /mysql-5.5.30-nodocs.tar.gz