commit 45ec33bf292abe20cd14891f38ac12d67e4a2cb2 Merge: b89c6e3 bc899c9 824d29b Author: Nicolas Chauvet <kwizart at gmail.com> Date: Sat Aug 28 13:18:09 2010 +0200 Initial pseudo merge for dist-git setup ---