[ofw] commit 1104

[Sean Hefty]

>Let's all try and focus on the future. (e.g., How will Win Verbs branch
>merging will be done), Productive comments will be welcomed.

As long as we're using SVN, I believe we need to end merging branches back into
the trunk.  Instead, patches should be generated to apply to the trunk.

This requires a little more work on the person trying to merge, but it's not
huge, and it makes it much easier trying to review and maintain the changes as
they hit the trunk.

- Sean