Author: branden Revision: 1952 Property Name: svn:log New Property Value: Merge revisions 1878 to HEAD from trunk.
WARNING: This merge was botched and included unrelated changes. For the real merge, include the subsequent revision to this branch, which reverts the unrelated changes.
