[mysql-workbench/f16: 2/2] Merge branch 'master' into f16

[Remi Collet]

commit 36f87ea3e058664fc97660e757761f39ab359e53
Merge: afdce12 691cf37
Author: remi <fedora at famillecollet.com>
Date:   Tue Dec 27 07:46:34 2011 +0100

    Merge branch 'master' into f16

 .gitignore           |    1 +
 mysql-workbench.spec |   14 +++++++++-----
 sources              |    2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)
---