Merge branch 'upstream'
authorJelmer Vernooij <jelmer@samba.org>
Sat, 19 Jan 2008 23:01:38 +0000 (00:01 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 19 Jan 2008 23:01:38 +0000 (00:01 +0100)

Trivial merge