[nted: 50/50] Initial pseudo merge for dist-git setup

[Hans Ulrich Niedermann]

commit cb603d44ebb4dddf8bf32a5a0c5e802b15871d26
Merge: 562a039 9449496 4403810 2e9eb1f 9aa6f91 562a039 e4bb46e
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Sat Jul 31 02:06:10 2010 +0200

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

---