Merge trunk.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 6 Apr 2008 00:04:41 +0000 (02:04 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 6 Apr 2008 00:04:41 +0000 (02:04 +0200)
commit80e2d1aeebde55166cbb98fd543911834595f5dd
treeb81fe469e7f2afb14f2ccd690599b896a2372f7d
parentac29d55e5ed24a44761a531f00a38a2a5e453e4a
parent24701116819fb29ca1caec0af6e1105586d21381
Merge trunk.