commit 7fd8db67a850896c838b196b6f1b3e688b7387fc Merge: 1bf3017 9f033ac 7c37a3d Author: Ismael Olea <ismael at olea.org> Date: Wed Aug 25 13:45:08 2010 +0200 Initial pseudo merge for dist-git setup ---