[MERGE] bzrlib.osutils fixes

[Robert Collins]

Robert Collins has voted -1.
Status is now: Vetoed
Comment:
_directory_kind is not being used yet, but its definately not a 
misfeature IMNSHO:

:!python -m timeit -s 'f = "foo"; b = "bar"' 'f == b'
1000000 loops, best of 3: 0.26 usec per loop

:!python -m timeit -s 'f = "foo"; b = "bar"' 'f != b'
1000000 loops, best of 3: 0.265 usec per loop

:!python -m timeit -s 'f = "foo"; b = "bar"' 'f is b'
1000000 loops, best of 3: 0.213 usec per loop

:!python -m timeit -s 'f = "foo"; b = "bar"' 'f is not b'
1000000 loops, best of 3: 0.211 usec per loop


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C45F122CD.4090800%40hlabs.spb.ru%3E