Merge branch 'v4-0-test' into id10ts-registry
authorJelmer Vernooij <jelmer@samba.org>
Sun, 2 Mar 2008 23:23:09 +0000 (00:23 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 2 Mar 2008 23:23:09 +0000 (00:23 +0100)
1  2 
source/lib/registry/ldb.c
source/lib/registry/regf.c
source/lib/registry/tests/hive.c

Simple merge
Simple merge
Simple merge