[MERGE] bzrlib.osutils fixes

[Alexander Belchenko]

Alexander Belchenko has voted +1 (conditional).
Status is now: Semi-approved
Comment:
Can you explain this part, please?

@@ -704,7 +711,8 @@
for dirdetail, dirblock in osutils._walkdirs_utf8('.'): 
self.assertIsInstance(dirdetail[0], str) if isinstance(dirdetail[1], 
unicode):
- dirdetail[1] = dirdetail[1].encode('utf8')
+ dirdetail = (dirdetail[0], dirdetail[1].encode('utf8')) + dirblock = 
[list(info) for info in dirblock]
for info in dirblock: self.assertIsInstance(info[4], unicode) info[4] = 
info[4].encode('utf8')


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