oops
Merge pull request #609 from monkeyiq/2013june/collabtmpdir5

oops