[Performous-commit] Miguel Sánchez de León Peque : Merge commit 'origin/master' into menu

[Peque <ms...@us...>]

Module: performous
Branch: menu
Commit: d804c3d71ad50012e7d321ef1183ea2dc0a018b2

Author: Miguel Sánchez de León Peque <msd...@gm...>
Date:   Sun Nov 29 18:52:33 2009 +0100

Merge commit 'origin/master' into menu

---