On Jul 14, 2009, at 1:40 PM, David Greene wrote: >> fix David's merge conflict > > Whoops! How did svn let me get aweay with that? You ran svn resolve or answered to resolve the conflict while doing the merge. :-)