[gpsbabel/f12/master: 8/8] Initial pseudo merge for dist-git setup

[Hans Ulrich Niedermann]

commit ca6a4df30a34d1b792fcb99314c2454bc0ef9969
Merge: aa6826f 6c41d2a 9e64123 cd326b1 aa6826f
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Tue Jan 11 15:38:39 2011 +0100

    Initial pseudo merge for dist-git setup
    
    This git merge exists to make future git merges much easier.

---