[Performous-commit] Vincent Le Ligeour : Merged and solved conflict from master

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: 6fc0a38608954259145f5a3eef66639f7e062e56

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sun May 30 13:01:32 2010 +0200

Merged and solved conflict from master

---