commit 455ba66b2570952420b7e7193b379e93c885bdf7 Merge: 7a512b0 c7611b4 Author: Pierre-Yves Chibon <pingou at pingoured.fr> Date: Mon Jul 2 20:57:00 2012 +0200 Merge branch 'master' into f17 ---