# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bialix@ukr.net-20070913093037-n8bp84n8kcifkvqu
# target_branch: file:///E:/Bazaar/mydev/bzr.dev/
# testament_sha1: a6f8a51c877d8fb0add4adc5b5da0573cc15d798
# timestamp: 2007-09-13 12:31:11 +0300
# base_revision_id: pqm@pqm.ubuntu.com-20070911055622-a3060rj7l0iy38l2
# 
# Begin patch
=== modified file 'bzrlib/__init__.py'
--- bzrlib/__init__.py	2007-08-17 05:16:14 +0000
+++ bzrlib/__init__.py	2007-09-13 09:30:37 +0000
@@ -43,7 +43,7 @@
 if version_info[3] == 'final':
     version_string = '%d.%d.%d' % version_info[:3]
 else:
-    version_string = '%d.%d.%d%s%d' % version_info
+    version_string = '%d.%d.%d.%s.%d' % version_info
 __version__ = version_string
 
 # allow bzrlib plugins to be imported.

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWxDOHEAAYffgEAQU+P//3IA
AAC////wUAN6LwJjFVrYSUFNNTyaekyCT8aJNM0jaieo9BNqGAAAAAGg0AaAaAYiEIxPVBp4U0Ab
UA9INAxgAAAABoNAGgGgElAEYjUxJinpNGIZMjTEBo1luIzHfvHHKJQRqT6rngAL7tLs9NZhxWdF
spjbqQTOuS+XyRY2LHMbl8S+/t1o/IWZ3j5Wh1YD79c2mznbRoqxfg1mNgmzVuER5RYrXUMWGq3r
qM/ZMFSta8xR+qFU+tRwYL+LQs9RJGFX37o2ecoqqWvchXEWKItq7Eq2TGJcEYl4SESxAQMBQYyH
bnVlvOdhpmbUAxqurgrvjchA2YK56lCQzMmVwbr1v6XFmyKljOMt11HchSyUTZo0JGchUUVAUyhi
OPAgKrjTkqDjY4DhykmDipv+pAaY2H9DNS9DEJCrrvGlVst3F0lA3jlitDNULkk+KzGyXaVealyu
KkUMIJMxEOLGrnMJI/SkSY8yLY8P2L3WOBMxqzqFuGne4WSyZYbNbzNqdBoqGDRcyzFc2HwZDVrC
hY6BQBHIbfYTQOaF9eF6pHW18amDodPyOyx4sJJ3yOn+JhC1BJfmpvIzMrFRWIIRLgNX6WyELxhE
DJeRYXkh3u8ja0hAsD0AgUu8d8JkrFmt4TePO85kh1iSJnAU7vZM3hYTEhTLOSwea4dPQT3eq49I
+Fzf6DasMCcuIJxmTaBVko7P9cjM+8p9e2zgMyxTPzgYE+zrPQ1/FWVeHjyhiZdL+6LvRMR4XM8X
QDoDmbloBPAC+ChpA5HyLmxQ9Orm4WSasfCj+fwF/L2N4TbVPzS11ZTzRaIwmLROLncEaOwcuzaE
MwXECy9uN0oqRuhOy1D+IoBN0SrF8LMp1bcu+m4DKaOm9YikvhM+/OpwnCI9wxnqLxE1B0kYAwd5
AOCLFohjEUpq2m9kCwHgsXI4BhIsXKjiW8hbGV0s3btyiYBTX2XnEnMZwWcxfMVuXFJqsF35O7XC
r9NMmJ6pWZHDQXujMCgGKCO6ToJXDdrNI2bEkQkmkeU1EHs1cB5djjBd/qWeNobyUr5DyYYLi1sG
EGJsjU44o8EyK31JbblPPfXoUJmd3gYCmeUpPCmnEtAu2vugJT4C7kinChINiGcOIA==