Rev 101: Merge new bzr-foreign. in http://people.samba.org/bzr/jelmer/bzr-git/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-git/trunk

------------------------------------------------------------
revno: 101
revision-id: jelmer at samba.org-20080827200352-ydtmy25urabkcikh
parent: jelmer at samba.org-20080827194033-t5nswkrrl1z11nkw
parent: jelmer at samba.org-20080827194301-mok29r5330g0boex
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2008-08-27 22:03:52 +0200
message:
  Merge new bzr-foreign.
modified:
  foreign/__init__.py            foreign.py-20080827193306-rxeku2c2obec90c4-1
    ------------------------------------------------------------
    revno: 0.1.3
    revision-id: jelmer at samba.org-20080827194301-mok29r5330g0boex
    parent: jelmer at samba.org-20080827193631-0q15lou3t0eb06sx
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Wed 2008-08-27 21:43:01 +0200
    message:
      Fix import.
    modified:
      __init__.py                    foreign.py-20080827193306-rxeku2c2obec90c4-1
=== modified file 'foreign/__init__.py'
--- a/foreign/__init__.py	2008-08-27 19:36:31 +0000
+++ b/foreign/__init__.py	2008-08-27 19:43:01 +0000
@@ -16,6 +16,9 @@
 
 """Foreign branch utilities."""
 
+from bzrlib import registry
+
+
 class VcsMapping(object):
     """Describes the mapping between the semantics of Bazaar and a foreign vcs.