[mikmod/f13/master: 5/5] Merge branch 'master' into f13

[Dennis Gilmore]

commit b4abfbe240e3b0a20f416dd019855ecdb1b305a1
Merge: 541f511 e31111a
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Thu Mar 10 22:52:32 2011 -0600

    Merge branch 'master' into f13

 mikmod-3.2.2-beta1-various-fixes.patch |   51 ++++++++++++++++++++++++++++++++
 mikmod.spec                            |   19 ++++++++++--
 2 files changed, 67 insertions(+), 3 deletions(-)
---