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

[Christof Damian]

commit 6c9916ec489514d9bf926277917125f6199ce59a
Merge: ee27a58 32d7311
Author: Christof Damian <christof at damian.net>
Date:   Mon Jun 4 20:44:57 2012 +0200

    Merge branch 'master' into f15

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