commit 7dd421a7610cfd7923eb290e29bd2ddf033eeb32 Merge: 5341500 d60fbc6 4818dab 8f0698c 97e778e 5341500 Author: Hans Ulrich Niedermann <hun at n-dimensional.de> Date: Sat Jul 31 02:06:09 2010 +0200 Initial pseudo merge for dist-git setup This will significantly simplify future merges between branches. ---