[lsnipes: 24/24] Initial pseudo merge for dist-git setup

[Hans Ulrich Niedermann]

commit b95ff83f9fc4b78ff634db8da915522cfc7b1e81
Merge: ff0430d c7e8ea2 07cbdf2 06ba199 f885fd3 ff0430d c5843b4 5b68508 742a334
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.

---