[lmms/f13/master: 4/4] Merge branch 'master' into f13

[Thomas Moschny]

commit 8846f5d2267cb34315272d2cf2f18f8a5a9d0feb
Merge: 861f5d0 2b0f73a
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Sep 5 14:05:32 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .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                                          |   44 +-
 repack.sh                                          |   22 +
 sources                                            |    2 +-
 8 files changed, 355 insertions(+), 299 deletions(-)
---