Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Thu, 23 Apr 2009 13:12:35 +0000 (15:12 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 23 Apr 2009 13:12:35 +0000 (15:12 +0200)
commit53d491c9a4011a7d9ad69db52fb91d163f3f990a
tree9d0ed3130f35142da50c2e20e8addfe8909f459f
parentaf6298a84dffb400551861c6dc34591f1473830c
parent1722859abd169f2949b5822f97c810f2b8d162da
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel