dwhittle: merged changes to branch 
dwhittle: merged changes to branch 


git-svn-id: b598a03d77248f21f0863c97ae4554bc3b750687@8163 ee427ae8-e902-0410-961c-c3ed070cd9f9

Symfony-Plugins/sfPropel14Plugin