reintegrated propro branch
authorMichael Wallner <mike@php.net>
Mon, 4 Feb 2013 11:58:08 +0000 (11:58 +0000)
committerMichael Wallner <mike@php.net>
Mon, 4 Feb 2013 11:58:08 +0000 (11:58 +0000)

Trivial merge