Merge branch 'pyregistry' of git://git.samba.org/jelmer/samba
commit759a3bcc88230c5232b748bb8f5a0c6e0cce128c
authorJelmer Vernooij <jelmer@samba.org>
Fri, 19 Dec 2008 22:55:45 +0000 (19 23:55 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 19 Dec 2008 22:55:45 +0000 (19 23:55 +0100)
tree25c15bb606cf573ac217f82b2110166a45520734
parent9617a3945b804bf2d1409285df2a7add12690063
parent04bef7fe2ab689a9ab569d5581034e0c02237771
Merge branch 'pyregistry' of git://git.samba.org/jelmer/samba

Conflicts:
source4/lib/ldb/ldb_wrap.c