[tuxguitar/f13/master: 3/3] Merge branch 'master' into f13

[Orcan Ogetbil]

commit 2ed6620c3e64ee7e8ac1a8582b90a8463ebe34cc
Merge: 0bf512a 5c0b833
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Fri Oct 1 21:56:57 2010 -0400

    Merge branch 'master' into f13

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