commit 337511a0cc9a30ef2ba4475f213c175a6e1931ec Merge: 3d470d1 f23b397 56a1e72 7df4d94 3d470d1 Author: Hans Ulrich Niedermann <hun at n-dimensional.de> Date: Sat Jul 31 02:06:11 2010 +0200 Initial pseudo merge for dist-git setup This will significantly simplify future merges between branches. ---