[Performous-commit] Lasse Karkkainen : Merge branch 'master' into menu

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

Module: performous
Branch: dance
Commit: 8e45377114ff4092063dc8d778c5edae604b3ee5

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov 28 07:02:19 2009 +0200

Merge branch 'master' into menu

Conflicts:
	docs/Compiling.txt

---