Merge upstream.
authorJelmer Vernooij <jelmer@samba.org>
Thu, 3 Apr 2008 15:58:37 +0000 (17:58 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 3 Apr 2008 15:58:37 +0000 (17:58 +0200)
commita732f596824fa5e8ac5458feead9bf05e279972e
tree9f63fefb3c20c494be8124eaede6523521f31fc7
parent591e0167ef167d362787b4e9d359f25d8e1856d8
parent7dec04b52bef9686ea18295a6b3f1729dc3c6ec1
Merge upstream.