Merge branch 'upstream'
authorJelmer Vernooij <jelmer@samba.org>
Sun, 20 Jan 2008 17:05:38 +0000 (18:05 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 20 Jan 2008 17:05:38 +0000 (18:05 +0100)
commite59d8fffe3db23ebccd6575efb4fc815b1bff527
tree46d01c78864f02f36302dd2268be28270486e67c
parent557fcc1663dee8929295cede8a9b59ab7a108240
parent9c37ab5380b90c4ef86ce52a6abce36a83b1d290
Merge branch 'upstream'