[1.1] backported fix from #2240 to 1.1 after having it tested in 1.2 version. fixes #5534
[1.1] backported fix from #2240 to 1.1 after having it tested in 1.2 version. fixes #5534

git-svn-id: 7038a89b398528086dab5106cc8d05243a854dbc@14468 ee427ae8-e902-0410-961c-c3ed070cd9f9

theodo/symfony1.1-backports,theodo/symfony1.1-backports,theodo/symfony1.1-backports