[mythtv] php 5.4 commit into fixes/0.25

[Monkey Pet]

Hi, can you add the follow two commits to the fixes/0.25 branch?  It fixes
issues with php 5.4 which fc17 needs for mythweb.  Thanks.

https://github.com/MythTV/mythweb/commit/7232c54eec2fa1416ef8c0b3fbdad642aaf26b55

https://github.com/MythTV/mythtv/commit/cd670ec7bf5f04f1ba67b5a7cbc00374479eb9b0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mythtv.org/pipermail/mythtv-dev/attachments/20120710/e69d0570/attachment.html>