[barcode/f12/master: 5/6] Initial pseudo merge for dist-git setup

[Hans Ulrich Niedermann]

commit 3b9c7b6f5b90f605675ef4d115b0b9f20977a8c1
Merge: 9bb2b75 80b22c6 a4e93ec 9bb2b75
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Sun Aug 1 01:19:32 2010 +0200

    Initial pseudo merge for dist-git setup
    
    This will significantly simplify later package maintenance
    by enabling proper git merges.

---