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)
commita578e65341ffdcb1a710e77f69ab7895fedb171a
tree31328509ad3856c99aad962b21b3c8f91289e027
parent78bc07e5c6efcf21435ab0691b54154950c39aa7
parent71a31067e42df22b05aff149897fc99b223a761e
Merge branch 'upstream'