merged ib work from peter

author Andrew Tridgell <tridge@samba.org>

Thu, 8 Feb 2007 22:54:21 +0000 (09:54 +1100)

committer Andrew Tridgell <tridge@samba.org>

Thu, 8 Feb 2007 22:54:21 +0000 (09:54 +1100)
author Andrew Tridgell <tridge@samba.org>
Thu, 8 Feb 2007 22:54:21 +0000 (09:54 +1100)
committer Andrew Tridgell <tridge@samba.org>
Thu, 8 Feb 2007 22:54:21 +0000 (09:54 +1100)
diff --cc .bzrignore

index 5d04ceb19e0fc0cdd48ef022276199a93c7f8796,b7f0a276305a465679f5281ad53e4456d340eb19..80886fdfe1b60aadfae3a6ad90df8b15e528dd8a
--- 1/.bzrignore
--- 2/.bzrignore
+++ b/.bzrignore
@@@ -7,6 -6,3 +6,5 @@@ push.s
   ctdb_test
   config.cache
   configure
- configure
+ +config.h
+ +config.h.in
author	Andrew Tridgell <tridge@samba.org>
	Thu, 8 Feb 2007 22:54:21 +0000 (09:54 +1100)
committer	Andrew Tridgell <tridge@samba.org>
	Thu, 8 Feb 2007 22:54:21 +0000 (09:54 +1100)