Merged Lift-2.4 branch back into trunk. git-svn-id: https://svn.apache.org/repos/asf/esme/trunk@1171005 13f79535-47bb-0310-9956-ffa450edef68