[e2tools: 32/32] Initial pseudo merge for dist-git setup

[Hans Ulrich Niedermann]

commit 06e638453e6453106d4d4dcc4c5cbc31f38dd114
Merge: d983f7a a79d8ed c6e1e43 e669e30 89e9032 d983f7a d1b0af6 25c8327 1cec671 2c12589
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.

---