On 15 May 2013 14:33, Bill Wendling <wendling at apple.com> wrote: > Hi Renato, > > What was the first patch? I get a conflict when I try to merge this in with the release branch. It was r181728. > -bw > Thanks, Rafael