Merge proposals dependent on lp:~lfaraone/ubuntu/maverick/tuxguitar/fix-mistaken-merge-20100527

1. Maverick (10.10)
2. fix-mistaken-merge-20100527
3. Dependent merge proposals