Merge branch 'master' of ssh://git.samba.org/data/git/samba
commitcc2d1eb743bb5b49b88a6fbdfeeb8730fb8e6189
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 21:22:15 +0000 (16 22:22 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 21:22:15 +0000 (16 22:22 +0100)
treef50af487e59cb3a41648d2fa3a9f84da9f4adf02
parentb3c926376cd2ba0e5d6dc84927eac92cdbd09c45
parentbbd5824140992ea457d4270ee77018ebb367abc9
Merge branch 'master' of ssh://git.samba.org/data/git/samba