Sat, 04 Feb 2012 01:38:15 +0100merge with CanFestival-3-asc
Edouard Tisserant [Sat, 04 Feb 2012 01:38:15 +0100] rev 712
merge with CanFestival-3-asc