Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 19 Mar 2009 03:02:26 +0000 (20:02 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 19 Mar 2009 03:02:26 +0000 (20:02 -0700)
commitadd8163c3b301ff153e7b492265fc2dc72784c7e
treee97dadf4f71e1f6e3c33cfba9c61f9ed5b304dc9
parenta00a9e4e2cc30338b4b44109e384f16f5df76f0b
parentd380c49791d1010d759369cab12d93b6fbd48dc7
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba