Merge branch 'master', remote-tracking branch 'upstream/master'
added mageia pkg devel names for conf-sdl-*'s
Merge pull request #957 from blue-prawn/master

added mageia pkg devel names for conf-sdl-*'s