Sun, 17 Jun 2012 12:37:52 +0200merge
Laurent Bessard [Sun, 17 Jun 2012 12:37:52 +0200] rev 12
merge