[php-channel-phing/f16: 3/3] Merge branch 'master' into f16

[Christof Damian]

commit ffbf42a14c50c512ee10b0776897ec12fdf47559
Merge: a3f24ad f370b39
Author: Christof Damian <christof at damian.net>
Date:   Fri Mar 2 20:49:06 2012 +0100

    Merge branch 'master' into f16

 channel.xml            |   32 ++++++++++++++++----------------
 php-channel-phing.spec |   11 +++++++++--
 2 files changed, 25 insertions(+), 18 deletions(-)
---