commit 61ad4ecb1926ef0135ed5635c62e61b40809979b Merge: a027973 e63ea3f Author: Pierre-Yves Chibon py at chibon.fr <pingou at pingoured.fr> Date: Wed Jun 29 16:01:50 2011 +0200 Merge branch 'master' into f14 ---