[soundtracker: 26/26] Initial pseudo merge for dist-git setup

[Hans Ulrich Niedermann]

commit 0355d81e008ddc1f33645bc5380d01ab1d937fa4
Merge: 63a537d e75ad70 3645e99 36df570 92cc86b 63a537d a8e7e0e 51c8f4f 6bb9272 325069f
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Sat Jul 31 02:06:11 2010 +0200

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

---