Merge upstream.
authorJelmer Vernooij <jelmer@samba.org>
Wed, 31 Oct 2007 13:39:28 +0000 (14:39 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 31 Oct 2007 13:39:28 +0000 (14:39 +0100)
commit32207aa1797bed9cf1474d9f83d32adb6aa0e6ea
tree5defd7d8065c341196b38f223478d9d635011c56
parent88ea9bc466fa9888f18eccef00acf966655615bf
parentf339cb3f845be484d44fb2f03d2820c6d79eca9c
Merge upstream.