[lmms/f12/master: 9/9] Merge branch 'master' into f12

[Thomas Moschny]

commit f228885bef1cb3305ccc819b1934505b971ffae5
Merge: 3af89f6 2b0f73a
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Sep 5 21:07:30 2010 +0200

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	README.fedora
    	lmms-0.4.6-vst-nowine.patch
    	lmms.spec
    	sources

 .gitignore                                         |    4 +-
 README.fedora                                      |  488 ++++++++++----------
 lmms-0.4.6-vst-nowine.patch                        |   13 -
 ...libexecdir.patch => lmms-0.4.8-libexecdir.patch |   54 ++-
 lmms-0.4.8-vst-nowine.patch                        |   27 ++
 lmms.spec                                          |   46 ++-
 repack.sh                                          |   22 +
 sources                                            |    2 +-
 8 files changed, 361 insertions(+), 295 deletions(-)
---