commit f0829c5b2b327dc12e432230ab0af9bc8a5bc273 branch master Merge: 6b86af2 8317c73 Author: Hugo Pereira Da Costa Date: Sat Dec 18 12:13:10 2010 +0100 Merge branch 'windowmanager'