Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorSimo Sorce <idra@samba.org>
Fri, 16 Jul 2010 13:57:03 +0000 (09:57 -0400)
committerSimo Sorce <idra@samba.org>
Fri, 16 Jul 2010 13:57:03 +0000 (09:57 -0400)
commit378e4d5b8d30733f0f28cc2bceb28d9b9b594707
tree9f6faebdcf58c73e0297bfdf3b905ef256f8e478
parent2f249538ac8f2a54d9c8f8dbf0107db2f33bfe16
parent6b266b85cf34145ac1f03d8f787b81121e4ec92b
Merge branch 'master' of ssh://git.samba.org/data/git/samba