Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 2 Apr 2009 03:20:44 +0000 (20:20 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 2 Apr 2009 03:20:44 +0000 (20:20 -0700)
commit1258ed8b1c52eff93aaa8fe132643e6c2ac31e56
tree36734756e93a27d1e17a5d58e67ee87f545d9217
parentaef0bdc6a1ffdf746ce9ce27c45b3ca4f6593ba9
parent87fe4d732d18d18ed56c99cba6a395a0bf9e9d95
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba