Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
commit389e2fb812097073d710cd7bf19396112936b404
authorJeremy Allison <jra@samba.org>
Thu, 17 Sep 2009 18:11:23 +0000 (17 11:11 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 17 Sep 2009 18:11:23 +0000 (17 11:11 -0700)
treec0813de9672cdbbceeb1bec790f81e8f8c429c10
parent95311a220e7107ec8b3012d67d5efef57313a274
parentf8dae40fc8e40f747a4571a2500bba9f1a790fa5
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba