symfony/symfony — pull request #2820 by aboks (2011-12-09 09:35:15+00:00)
Title: Integrates #2733 into master branch

Bug fix: yes
Feature addition: no
Backwards compatibility break: no (99%)
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: PR #2733 needs to be merged into 2.0 first

This PR fixes merge conflicts and failing tests that would otherwise arise if #2733 is merged into 2.0 and then 2.0 is merged into master. By first merging #2733 into 2.0, then directly merging this PR into master, 2.0 will merge cleanly into master afterwards.