Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
commit4df9f1860ed63ff88ee6c47596faa293cc9330bd
authorJeremy Allison <jra@samba.org>
Sat, 14 Feb 2009 00:07:07 +0000 (13 16:07 -0800)
committerJeremy Allison <jra@samba.org>
Sat, 14 Feb 2009 00:07:07 +0000 (13 16:07 -0800)
tree148ab362db021d16bde26a72fc2a156bbe1e746d
parent49b52ec16f8150d71a0ebfdd0a7067981fe5840a
parentca87726f81392e475ba86680a8735ee7d890c553
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba