[SDL_net/el5/master: 10/11] Merge branch 'master' into el5

[Tim Niemueller]

commit 614594698fef7d48e7af0fb128bb6f67078617f0
Merge: 66d4c31 ec5cf43
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:   Mon Nov 8 14:24:06 2010 -0500

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore

 SDL_net.spec |   29 +++++++++++++++++++++++++----
 sources      |    2 +-
 2 files changed, 26 insertions(+), 5 deletions(-)
---