Fixed merge

This commit is contained in:
Christophe Riccio
2011-09-16 09:46:37 +01:00