Rev 11333: Merge upstream in file:///home/jelmer/bzr.samba/4.0-debian/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba/4.0-debian/

------------------------------------------------------------
revno: 11333
revision-id: jelmer at samba.org-20070313210954-ll85l9c09ssqevwd
parent: jelmer at samba.org-20070313205153-o1ik2w72muyfwwat
parent: svn-v2:21832 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-debian
timestamp: Tue 2007-03-13 22:09:54 +0100
message:
  Merge upstream
modified:
  .bzrignore                     svn-v2:17811 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-.bzrignore
    ------------------------------------------------------------
    revno: 11321.1.414
    merged: svn-v2:21832 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: svn-v2:21830 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: jelmer at samba.org-20070313205911-2qeuajor1nerl6x5
    committer: jelmer
    timestamp: Tue 2007-03-13 21:00:27 +0000
    message:
      Ignore some more autogenerated files.
    ------------------------------------------------------------
    revno: 11321.1.413.1.1
    merged: jelmer at samba.org-20070313205911-2qeuajor1nerl6x5
    parent: svn-v2:21830 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: SAMBA_4_0
    timestamp: Tue 2007-03-13 21:59:11 +0100
    message:
      Ignore some more autogenerated files.
=== modified file '.bzrignore'
--- a/.bzrignore	2007-03-13 18:20:56 +0000
+++ b/.bzrignore	2007-03-13 21:09:54 +0000
@@ -55,9 +55,7 @@
 source/lib/charset/charset_proto.h
 source/lib/cmdline/credentials.h
 source/lib/ldb/samba/ldif_handlers.h
-source/lib/registry/reg_backend_rpc.h
 source/lib/registry/regf.h
-source/lib/registry/registry_proto.h
 source/lib/registry/tdr_regf.c
 source/lib/registry/tdr_regf.h
 source/lib/samba3/samba3_proto.h
@@ -196,3 +194,5 @@
 debian/*.substvars
 debian/*.debhelper
 debian/files
+source/tests
+source/torture/unix/proto.h