Merge upstream.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 8 Jul 2008 17:10:58 +0000 (19:10 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 8 Jul 2008 17:10:58 +0000 (19:10 +0200)
commit71bd57a9d36eac65542aa04a358023cfc6932d27
tree93b6460840f4b87c8cfbc5d7a892816e5286b82d
parentd0d3f2f9c3a3e88b6b86795b4edd11e24548a22e
parenta559a7db29777b7ab7d544e71b1ff319651ed173
Merge upstream.