Merge john.
authorJelmer Vernooij <jelmer@samba.org>
Wed, 17 Dec 2008 20:44:43 +0000 (20:44 +0000)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 17 Dec 2008 20:44:43 +0000 (20:44 +0000)
commit073976c9d1ac52f857a722838cbde686393c7e7c
tree80ed10deacf69266d28ea9d2ea47ffdc43e4fd07
parented1e8021e6610b3ffbb827764567951b85ae9ba2
parent3eeb0fd3ce8487b9926bc7247b5f3f9696c81b71
Merge john.