Merge branch 'upstream'
authorJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 14:49:32 +0000 (16:49 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 14:49:32 +0000 (16:49 +0200)

Trivial merge