Fri, 05 Apr 2013 00:56:54 +0200Merged
Laurent Bessard [Fri, 05 Apr 2013 00:56:54 +0200] rev 1018
Merged