Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Sun, 19 Jul 2009 15:39:23 +0000 (17:39 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 19 Jul 2009 15:39:23 +0000 (17:39 +0200)
commit8557d14f65212faceb3e7223818b34b8869a0470
tree77979da96009cd84c850db60a1300b9956fe8587
parent7a765b65b739c38ea1e3cfc136c92d2fb5ed4fa7
parent4447bd96b90ce4bfca793d482f9dcbd98e6579a5
Merge branch 'master' of git://git.samba.org/samba