[Performous-commit] Tapio Vierros : Merge branch 'master' into joinmenu

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: ffe7f4a2dd256f29f9ce2d84693a3fda967cfce0

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Aug 21 16:20:54 2010 +0300

Merge branch 'master' into joinmenu

Conflicts:
	game/guitargraph.hh
	game/instrumentgraph.hh
	game/screen_sing.cc

---