[php-symfony-symfony/f17: 4/4] Merge branch 'master' into f17

[Christof Damian]

commit d71505e3982bd3859fa1c40ef6b69c28ccc54c4c
Merge: 1f54e97 66ce325
Author: Christof Damian <christof at damian.net>
Date:   Mon Nov 26 20:19:45 2012 +0100

    Merge branch 'master' into f17

 .gitignore               |    1 +
 php-symfony-symfony.spec |   17 +++++++++++++++--
 sources                  |    2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)
---