Rev 97: Merge small import fix from Alexander. in file:///data/jelmer/bzr-rebase/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-rebase/trunk/

------------------------------------------------------------
revno: 97
revision-id: jelmer at samba.org-20080701022232-8loxbt0ppfxfy19o
parent: jelmer at samba.org-20080623020428-ra3snuwqos2quw92
parent: bialix at ukr.net-20080620185634-22vfc713ucipsnok
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2008-07-01 04:22:32 +0200
message:
  Merge small import fix from Alexander.
modified:
  __init__.py                    __init__.py-20070626215909-fi0s39bkwxn4gcto-1
    ------------------------------------------------------------
    revno: 96.1.1
    revision-id: bialix at ukr.net-20080620185634-22vfc713ucipsnok
    parent: jelmer at samba.org-20080623020428-ra3snuwqos2quw92
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: rebase
    timestamp: Fri 2008-06-20 21:56:34 +0300
    message:
      Don't import Option from bzrlib/commands.py
    modified:
      __init__.py                    __init__.py-20070626215909-fi0s39bkwxn4gcto-1
=== modified file '__init__.py'
--- a/__init__.py	2008-06-11 17:35:50 +0000
+++ b/__init__.py	2008-06-20 18:56:34 +0000
@@ -21,10 +21,11 @@
 'rebase-continue' command or abort using the 'rebase-abort' command.
 """
 
-from bzrlib.commands import Command, Option, display_command, register_command
+from bzrlib.commands import Command, display_command, register_command
 from bzrlib.errors import (BzrCommandError, ConflictsInTree, NoSuchFile, 
                            UnrelatedBranches, NoSuchRevision, 
                            UncommittedChanges)
+from bzrlib.option import Option
 from bzrlib.trace import info, warning
 
 version_info = (0, 4, 0, 'dev', 0)