Merge branch 'upstream' master
authorJelmer Vernooij <jelmer@samba.org>
Wed, 9 Apr 2008 14:21:14 +0000 (16:21 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 9 Apr 2008 14:21:14 +0000 (16:21 +0200)

Trivial merge