commit 7d5e4c281432c6587e3b03a58741fd78ba833ad7 Merge: c495731 e63ea3f Author: Pierre-Yves Chibon py at chibon.fr <pingou at pingoured.fr> Date: Wed Jun 29 16:03:49 2011 +0200 Merge branch 'master' into f15 ---