Merge John.
authorJelmer Vernooij <jelmer@samba.org>
Thu, 25 Dec 2008 13:50:59 +0000 (13:50 +0000)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 25 Dec 2008 13:50:59 +0000 (13:50 +0000)
commit7568783174b7495a7c57591dd0625a97bb0f2e4c
tree389d507a7eb76b64a4836bec2bdd4ce934dd9027
parent512275cdf57bda06f729ce6eeef66108e5bd4f06
parentb0c9688c8fa149e64eb077a3a7045cd9e7192d10
Merge John.