Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 21 Jan 2008 23:53:14 +0000 (10:53 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 21 Jan 2008 23:53:14 +0000 (10:53 +1100)
commit74220ca244865f97825cabdbc8aa899e71c25c7d
treefd2d81406799dc192e96bd062e98a18c389d3f48
parent8831a5c7935f7e2181252b7b6561541b8c8db679
parentb99b604a5f8b7eb98a6285145188c0b94946df78
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet