commit 1874494b502a0fa7f4086cbe8a7944b00000f8fb Merge: 0f9f435 cd6ee19 c554e83 Author: Hans Ulrich Niedermann <hun at n-dimensional.de> Date: Tue Jan 11 15:38:38 2011 +0100 Initial pseudo merge for dist-git setup This git merge exists to make future git merges much easier. ---