[simulavr: 11/11] Initial pseudo merge for dist-git setup

[Hans Ulrich Niedermann]

commit 1ea3ced5e448b001eee022612a2a0cbb779100fa
Merge: e23b1dd 4415f8e 772ee1d f0d1d47 e23b1dd
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.

---