commit 5b499e23c8647a80f0d68cabb039fb7d757d81c9 Merge: bbd76b9 46e3728 f2c3c21 Author: Ismael Olea <ismael at olea.org> Date: Sun Aug 29 14:51:39 2010 +0200 Initial pseudo merge for dist-git setup ---