Problems on demo

[Bruno Busco]

Hi,
it seems that on the demo there is a SVN merge conflict.
This is probably due to the recent svninfo stuff.

-Bruno