[MERGE] Fix test run from non-branch in repo

[Robert Collins]

Robert Collins has voted +1.
Status is now: Approved
Comment:


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C20070116213001.GS3615%40jameswestby.net%3E