Merge branch 'upstream'
authorJelmer Vernooij <jelmer@samba.org>
Sun, 20 Jan 2008 17:05:38 +0000 (18:05 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 20 Jan 2008 17:05:38 +0000 (18:05 +0100)

Trivial merge