Merge John.
authorJelmer Vernooij <jelmer@samba.org>
Wed, 14 Jan 2009 00:05:40 +0000 (00:05 +0000)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 14 Jan 2009 00:05:40 +0000 (00:05 +0000)
commitb8c6f1269780ed824aa6388d9cbe45b6f9cecfa7
treef042caba7a268173f112d5e272a55c82184dd231
parent6863e0da8cc35fa4febfa94403db01f565e1582c
parent9691addc84c992a867563c815f689719f2655d3b
Merge John.