Merge upstream.
authorJelmer Vernooij <jelmer@samba.org>
Thu, 13 Sep 2007 21:56:50 +0000 (23:56 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 13 Sep 2007 21:56:50 +0000 (23:56 +0200)
commit2f9d1b791448ce73dc9c5ebe32775f6f0728ca04
tree0dfe1c8646c129e294d789b3ca9caf6989e58430
parenta0326dd4e622be353c6a05a7cb94347540f087e6
parent0d4d6c913d363006aa7f815ca3fdaefe2c347f53
Merge upstream.