[Performous-commit] Johnny Oskarsson : Merge branch 'master' into opengl2

[Johnny O. <js...@us...>]

Module: performous
Branch: opengl2
Commit: 6a67c4acf5948ff9edd89d37e7fbada26071be4a

Author: Johnny Oskarsson <js...@us...>
Date:   Thu Oct 28 22:54:24 2010 +0200

Merge branch 'master' into opengl2

---