commit 27a3b2a7e1c12e1d63d903a8386487363a85a2db Merge: a58c8c0 c068439 Author: Nicolas Chauvet <kwizart at gmail.com> Date: Sat Dec 11 16:26:32 2010 +0100 Initial pseudo merge ---