The BuildID should differ between the branch and the trunk, so that we have a reliable means of differentiating between them. Maybe it should be like 2001070318.0 for trunk, 2001070318.1 for branch, where the last digit is incremented each time we do a release build on a branch.
Spam some more folk
wontfix. talkback uses the buildid to work. if you need to tell trunk from branch, use the user agent string, that's what it's there for. 0.9.2+ == trunk 0.9.2 == branch.