[php-pear-phing/f16: 4/4] Merge branch 'master' into f16

[Christof Damian]

commit 5adaf1923b2e8b4db27ca7627cb8ec6bbc6e9a4f
Merge: 16fe959 a0eaa62
Author: Christof Damian <christof at damian.net>
Date:   Fri Mar 2 22:22:14 2012 +0100

    Merge branch 'master' into f16

 .gitignore          |    1 +
 php-pear-phing.spec |   10 ++++++++--
 sources             |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---