[MERGE] Various hackery to reduce startup time.

[Alexander Belchenko]

Matt Nordhoff пишет:
> Nit:
> 
>> === modified file 'bzrlib/tests/test_osutils_encodings.py'
>> --- bzrlib/tests/test_osutils_encodings.py	2008-05-05 17:02:02 +0000
>> +++ bzrlib/tests/test_osutils_encodings.py	2008-09-08 12:59:00 +0000
> 
>> @@ -119,7 +118,7 @@
>>          self.assertEqual('stdin_encoding', osutils.get_terminal_encoding())
>>  
>>          sys.stdin.encoding = None
>> -        # and in the worst case, use bzrlib.user_encoding
>> +        # and in the worst case, use osutils.get_user_encoding()
>>          self.assertEqual('user_encoding', osutils.get_terminal_encoding())
>>  
>>      def test_terminal_cp0(self):
> 
> The comment refers to get_user_encoding, but the code uses
> get_terminal_encoding.

It's totally correct.