Fri, 15 Jun 2012 18:28:57 +0200merge
Edouard Tisserant [Fri, 15 Jun 2012 18:28:57 +0200] rev 8
merge