[SDL_gfx/el6: 6/6] Merge branch 'master' into el6

[Matthias Saou]

commit 074cf053bb68f94105c94ea1a0d4df57c6fb38f5
Merge: 9992a1c f2966c5
Author: Matthias Saou <thias at marmotte.net>
Date:   Wed Jul 13 12:55:32 2011 +0200

    Merge branch 'master' into el6

 .gitignore   |    2 +-
 SDL_gfx.spec |   43 ++++++++++++++++++++++++-------------------
 sources      |    2 +-
 3 files changed, 26 insertions(+), 21 deletions(-)
---