# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: john@arbash-meinel.com-20071010211806-2j9rg6wzrqh7yy4u
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev
# testament_sha1: a674a89034fa105f671c9ea7e5eb3a1500957e68
# timestamp: 2007-10-10 16:20:05 -0500
# source_branch: http://bazaar-vcs.org/bzr/bzr.dev
# base_revision_id: pqm@pqm.ubuntu.com-20071010085229-7x5al1tirr29mq0l
# 
# Begin patch
=== modified file 'bzrlib/_dirstate_helpers_c.pyx'
--- bzrlib/_dirstate_helpers_c.pyx	2007-10-09 03:35:33 +0000
+++ bzrlib/_dirstate_helpers_c.pyx	2007-10-10 21:18:06 +0000
@@ -478,7 +478,7 @@
     cdef char *cur_cstr # Pointer to the current record
     cdef char *next # Pointer to the end of this record
 
-    def __new__(self, text):
+    def __init__(self, text):
         self.text = text
         self.text_cstr = PyString_AsString(text)
         self.text_size = PyString_Size(text)

=== modified file 'bzrlib/_knit_load_data_c.pyx'
--- bzrlib/_knit_load_data_c.pyx	2007-07-05 19:39:28 +0000
+++ bzrlib/_knit_load_data_c.pyx	2007-10-10 21:18:06 +0000
@@ -86,7 +86,7 @@
 
     cdef int history_len
 
-    def __new__(self, kndx, fp):
+    def __init__(self, kndx, fp):
         self.kndx = kndx
         self.fp = fp
 

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWc0fmSoAAprfgGAQUW///3//
/yC////wUAV4ngAJ1qUKKOgSUFGU8lP0TBoNGptNRijxJ6CeRGgeoG9KeoIiTJoyeTUDQeiNABoa
AxNGg0HqABkp5ICnknig0/UEAAANNAAep6R6gDhppkYjCaYCGATTCMExMhpkaGgEkggAmEymCaZB
TYk9pCeUyeoA0NGmRRKDTpZ9S4DfFjXGF9MAfezSlihVMecInNSGSEEyPR7onDA5ROlYLhZibTPe
JghRES32IhtuhjDQCd7KiKipG/f90yBcpx2ChljsF7NX+71FrStAHXQB0l9QKJviR4vyc+GbVFuz
uyQGUc/OQ5Wv0pNnwuSU1KtFjNeq6n4DWIOC0KoxVEASRsEpRFJfEykFQztMRcxYZnxcpzcDCKeP
eRGNAbl8puu/7HD/ei+VIuZneAkXpAwwi4v6wzXaMRJjMJmeMTiHTkQgwBOMEGzKDYRTgjfURf8z
kxpPcED06sEXsYDLAh/14YJJhDDHG+7x0FQKNRI2OnUZ/kTF1CfITESETAtcel8BHBrJXsrieyQo
4hooEiwsjKYCLTtKa6y0HlWRjUPUhM9UEoYl4Xi0FZXLSXCNU7pmhbPKPuHBO2wfFTGX0JazRQcq
CkuLyzRWfFok5qpnIqLR6uIPCQjYMZnN91hwJDPPYtpnBbrC82GBKZ4nA6hHq14lAqgbFsQsv55I
mIxb3BcYHM4YYsNlQ8mEVvKB7ypRHm41h3UkR5As7hEdZMhwwBYUd+2BcVF1aLTE2Gw2hrEZRkZy
0UOSGIGEYlaLx5bkMWFHn33nXvww3lVxZeXBIXLMlJHlrHMQfS4Y2zEvAoMGDWI+BjqqkscxcW3P
csKGg5RirZSbae1iXkw2THcySE1uHMtJtsaEOj5rLudC0gY1zgWYLH386m97irTIRoYxgz0NW/VV
O6LuyybJIxlVXAnkm6gUEC6JitU2QQVIRgMekQ9jeumNgFlgMMEhi5fGuuct+4QQ1+tig3R6dtk8
Y8nlvp/pMbm+vEMXvVwOzY47aNaeNxGadOFCD4SeUPFlrLzyIp7BXUcjyMCQ9w4fF/hx38c92HpH
C8PMGXVGPlKgUaD6oW/grsK6L02yaszMpzQazd++CFw3ETVfLyDucSpcA2eovPztNpRvN5wH33m3
bqnb8QDdQ/yKjC8+01F5UDEUOJJgLEBevDslrl6j7edb8cXZPhsnT+Ch7QyZyUrTwV3XzqKxW0nS
vA6NRsVDlSRF3dJZbKXboedYK1CyKFVcRnLP0Tkqr4T7F9WDmJyLVzTiHNBKGlVmauH2kmXAq0m3
tiuiK5fI6ztJMHIsacfwxEeyoCrP57zZkwJqP6EPeyVXWq0J9yM5hzrdY0JP7mS1Ep4c6pzFAy/w
XMhWYlx543wRJH8iCwusRbF44KYSWgwYxEPLHtVqkGnOU5ijCL+bjW4E4PhMjpCKY8JDQS7yeC6c
CTpQGQUmWt4RWNS6QTYc9xPNTJMuQWy+uTaMd7A8F1uDWuVMwuzjI9C8dTsfK0c9TKEEnslsD9nh
ZqKceJeGgFodSgOhI3SPREKMJdjlkbJTXnpmVFFCKy0qcM6ZnfT0D1TqNNIzt4p6g9plpEe2IHv5
uok6CUG/Ts0izfKCy+rdj0GPsMTSyf4esRZNxuLQx4byR4RESBKDKVwzDLVpHzjOd0EfcbsBJlhW
r3VKhCWHlMRrTgQmQmWDo/HcGLbiE5EQSIBaiFyMGNdFQpyWE9ZE4BO4pFEUWRKwUPPMCkGOQR7A
f469p1BXXopohpcmEWUdZlDz+MT4CIdJ2QcHoEkUtOVrSCNo99nUlOIcalPPpXmI9v/i7kinChIZ
o/MlQA==