Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorSimo Sorce <idra@samba.org>
Fri, 16 Jul 2010 00:50:06 +0000 (20:50 -0400)
committerSimo Sorce <idra@samba.org>
Fri, 16 Jul 2010 00:50:06 +0000 (20:50 -0400)
commit2f249538ac8f2a54d9c8f8dbf0107db2f33bfe16
tree00eb61080648488e0d4d5e370f4d30827f4e9228
parent0ab8e8be62bcbb1f6441f745736fcee7cbd559eb
parent5f8678f34be57ccbbf9d9c93ee34b1d8f09c75c4
Merge branch 'master' of ssh://git.samba.org/data/git/samba