[tuxguitar/f12/master: 7/7] Merge branch 'master' into f12

[Orcan Ogetbil]

commit c2644ecb23359cf71d0d1d3a2effabc894cb5e7c
Merge: bff7d1b 5c0b833
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Fri Oct 1 21:59:34 2010 -0400

    Merge branch 'master' into f12
    
    Conflicts:
    	tuxguitar-build-fedora.xml
    	tuxguitar.spec

 tuxguitar-build-fedora.xml |    2 +-
 tuxguitar.spec             |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---