Sat, 04 Feb 2012 00:57:39 +0100merges with https://bitbucket.org/JaFojtik/canfestival-3
Edouard Tisserant [Sat, 04 Feb 2012 00:57:39 +0100] rev 698
merges with https://bitbucket.org/JaFojtik/canfestival-3