commit 57011e785808847273461aaf6d8ed1df76ff1db9
Merge: b9d4e0c1 bf8974e6
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Feb 6 02:49:46 2010 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sat Feb 6 02:49:46 2010 +0000

    Fix branch_helper properties for strife-branch.

    Subversion-branch: /branches/strife-branch
    Subversion-revision: 1848