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

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

Module: performous
Branch: opengl2
Commit: 2cb68f00a914a180b6d1c2cce4e36cc4f6f27325

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

Merge branch 'master' into opengl2

---