commit a58c8c08f9c906f50e025beab5ec6f9ee8df2746 Merge: 94f83dc 8846d5a Author: Nicolas Chauvet <kwizart at gmail.com> Date: Sat Dec 11 16:26:30 2010 +0100 Initial pseudo merge ---