Merge upstream fixes for installation.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 5 Dec 2006 16:54:39 +0000 (17:54 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 5 Dec 2006 16:54:39 +0000 (17:54 +0100)

Trivial merge