[erlang: 127/127] Initial pseudo merge for dist-git setup

[Hans Ulrich Niedermann]

commit f474a9a060b47bb45ee5573bcfa068b3592429f0
Merge: 86338f0 0f25824 a826b2d 2800637 0ed2dfe 465a13c 3c4f7bf 9be12b1 4d7f707 98e538f d1d41c6 d1d41c6 86338f0
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Sat Jul 31 01:57:24 2010 +0200

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

---