[mysql/f18: 6/6] Merge branch 'master' into f18

[Honza Horak]

commit efb23b075ec843985147e8c3aadefd964458a799
Merge: 29151ea c25e72f
Author: Honza Horák <hhorak at redhat.com>
Date:   Wed Dec 12 16:56:31 2012 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	mysql.spec

 mysql-cipherspec.patch      |   60 ++++++++++----------
 mysql-dubious-exports.patch |  124 +++++++++++++++++++++---------------------
 mysql-errno.patch           |    8 ++--
 mysql-plugin-bool.patch     |   40 +++++++-------
 mysql-s390-tsc.patch        |   18 +++---
 mysql-stack-guard.patch     |   12 ++--
 mysql-string-overflow.patch |   26 +++++-----
 mysql-strmov.patch          |    8 ++--
 mysql-va-list.patch         |   14 +++---
 mysql-versioning.patch      |    8 ++--
 mysql.spec                  |   11 ++++-
 11 files changed, 169 insertions(+), 160 deletions(-)
---