commit ca171970a195d247807b3f568aa4e3ca8539db9a Merge: d6cf610 9c9084e Author: Nicolas Chauvet <kwizart at gmail.com> Date: Mon Aug 23 19:40:03 2010 +0200 Initial pseudo merge for dist-git setup ---