[cstream: 27/27] Initial pseudo merge for dist-git setup

[Hans Ulrich Niedermann]

commit b8ac230f4e8cbe1891fb27ff41d4a5a34f7c400a
Merge: 83695dd c9a4e20 532e6cd c80949c 192b563 83695dd 904aa2e 88282bd 2b522bf
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Sat Jul 31 02:06:08 2010 +0200

    Initial pseudo merge for dist-git setup
    
    This will significantly simplify future merges between branches.

---