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

[Christof Damian]

commit 1f54e97134d197403861a12fdabbe9776aab3b03
Merge: 60661b3 32d7311
Author: Christof Damian <christof at damian.net>
Date:   Mon Jun 4 20:01:54 2012 +0200

    Merge branch 'master' into f17

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