merge from tuxguitar_1.1-1.dsc
merge from tuxguitar_1.1-1.dsc

git-svn-id: 84c3fc8f8b7c748ac4673c6e3b4ab32f9044901c@632 e5ace225-184b-0410-aeed-e0aa2ff36a70

yuan39/TuxGuitar,yuan39/TuxGuitar,yuan39/TuxGuitar,yuan39/TuxGuitar,yuan39/TuxGuitar