[php-simplepie/f16: 2/2] Merge branch 'master' into f16

[Nick Bebout]

commit 5b27176d84d6445b60768d9b5dc7c963995fb133
Merge: 70fcb68 2548119
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Dec 18 20:13:45 2012 -0600

    Merge branch 'master' into f16

 php-simplepie.spec |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)
---