[LuxRender/f13/master: 10/10] Initial pseudo merge for dist-git setup

[Nicolas Chauvet]

commit 6e3b06490d6c55547a0aea27fcc7013bb8ce3d6e
Merge: 80c55a5 a309b53 3d4a50e
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Mon Aug 23 00:14:45 2010 +0200

    Initial pseudo merge for dist-git setup

---