Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit5baac15781779a3ebfa3807299e5329809835370
authorJelmer Vernooij <jelmer@samba.org>
Sun, 25 Jan 2009 04:35:21 +0000 (25 05:35 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 25 Jan 2009 04:35:21 +0000 (25 05:35 +0100)
tree0ea19612d064f02a8bd9fc62df1bef63da276e67
parentc9d193eb08b036c5196d63c22790f3cd3583ba82
parent8b804077128cd981bf238b2506c589dff3bf8ff4
Merge branch 'master' of ssh://git.samba.org/data/git/samba