[MERGE] Changed the base test directory setup to use osutils.pathjoin instead of os.path.join

[John Arbash Meinel]

John Arbash Meinel has voted approve.
Status is now: Approved
Comment:
I thought some variant of this was merged, I'll try to get it in soon.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C489C061C.5080207%40gmail.com%3E
Project: Bazaar