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

[Honza Horak]

commit 2c657945278f63875500bca5afbac282568b37a3
Merge: d68331c 00fd360
Author: Honza Horák <hhorak at redhat.com>
Date:   Fri Jun 14 13:17:08 2013 +0200

    Merge branch 'f18' into f17

 .gitignore             |    2 ++
 mysql-innodbwarn.patch |   20 ++++++++++++++++++++
 mysql.spec             |   43 +++++++++++++++++++++++++++++--------------
 sources                |    3 ++-
 4 files changed, 53 insertions(+), 15 deletions(-)
---
diff --cc .gitignore
index ee32730,9b0246a..2245f8f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,5 +1,4 @@@
 -/mysql-5.5.29-nodocs.tar.gz
  /mysql-5.5.30-nodocs.tar.gz
  /mysql-5.5.31-nodocs.tar.gz
+ /mysql-5.5.32-nodocs.tar.gz
+ /mysql-man-gpl.tar.gz