reintegrate the DEV_2-client branch
authorMichael Wallner <mike@php.net>
Fri, 30 Mar 2012 12:27:02 +0000 (12:27 +0000)
committerMichael Wallner <mike@php.net>
Fri, 30 Mar 2012 12:27:02 +0000 (12:27 +0000)

Trivial merge