man, our branching experience with subversion 1.6 has been.. painful. Still finding misc. code that got lost in the merge.