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

[Sven Lankes]

commit 22245bc2b33608014e6a789c30ef6fa201ec7c47
Merge: ead9030 5c2bfc6
Author: Sven Lankes <sven at lank.es>
Date:   Fri Aug 13 02:55:45 2010 +0200

    Initial pseudo merge for dist-git setup

---