From 0be0c4a79bde6d346baf49eccc2bc66397ab1745 Mon Sep 17 00:00:00 2001
From: Jim Jagielski <jimjag@php.net>
Date: Wed, 17 Jul 2013 11:48:09 +0000
Subject: [PATCH] canon naming