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

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

Module: performous
Branch: menu
Commit: e64ccae023ee05e15e3d483e0b50e949e4605cdb

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

Merge commit 'origin/master' into menu

---