Merge trunk
authorJelmer Vernooij <jelmer@samba.org>
Mon, 15 Jan 2007 13:12:14 +0000 (14:12 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 15 Jan 2007 13:12:14 +0000 (14:12 +0100)
commitd0031e77356cb8f764fa703abc5b890ce657d5ea
treeb5a8ffbd20aac4eab805de6c0be68c93749ed805
parent28f89ac4e765f47ca2e82f50615eff97c7b1f6c7
parentafe2f7a161489dabfe5cfefe6ad716d351e4b451
Merge trunk