On Thu, Aug 25, 2011 at 3:25 PM, Grant Diffey <gdiffey at gmail.com> wrote: > Daniel, > > Thanks heaps for all your work. > > I'm trying to apply this to stable and having conflicts what's it based > against? Takashi's sound-2.6 master branch. I forked from it some days ago. Daniel