merged bodycount branch
authorMichael Wallner <mike@php.net>
Fri, 21 Dec 2012 13:59:36 +0000 (13:59 +0000)
committerMichael Wallner <mike@php.net>
Fri, 21 Dec 2012 13:59:36 +0000 (13:59 +0000)

Trivial merge