commit 76659a4c4bf96638be65105afe9dea344b8b8993 Merge: 37ff67f e840aa6 Author: Ismael Olea <ismael at olea.org> Date: Mon Dec 20 13:13:48 2010 +0100 Merge remote branch 'origin/f12/master' ---