[filezilla/f13/master: 24/25] Initial pseudo merge for dist-git setup

[Nicolas Chauvet]

commit 89c4b29abd8d1460b851094a2467e9c11de2bfe9
Merge: 761412f b53897b
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Wed Jan 12 12:24:52 2011 +0100

    Initial pseudo merge for dist-git setup

---