Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Fri, 12 Dec 2008 09:31:02 +0000 (10:31 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 12 Dec 2008 09:31:02 +0000 (10:31 +0100)
commit306e9f14255cf04cf8f91e6a52ddc7faa160e55a
tree2faf455a2b50d0a45a7dca4252c54288598adaa1
parent076479aac3485180812eccf4c7ef8cc50eca9575
parent370cc9c776bcde683b9cc9704a781b093cf3bdaa
Merge branch 'master' of ssh://git.samba.org/data/git/samba