commit c041d6562e31c905eab261cfc5a5fba37068678d Merge: 9afaac8 5158cca Author: Pierre-Yves Chibon <pingou at pingoured.fr> Date: Mon Jul 2 20:58:05 2012 +0200 Merge branch 'f16' into f15 ---