Merge branch 'master' of git://git.samba.org/samba
authorNadezhda Ivanova <nadezhda.ivanova@postpath.com>
Tue, 22 Sep 2009 00:29:28 +0000 (17:29 -0700)
committerNadezhda Ivanova <nadezhda.ivanova@postpath.com>
Tue, 22 Sep 2009 00:29:28 +0000 (17:29 -0700)
commit9e85192e6415fbaacf394330f6e61759190485ad
tree9e9a8c9d7fdd4dbcc471e69c4c4708eb6ae11dc3
parent10c6f3f71a4fe3e36e2a0476dc0077187371fafb
parentb850d7fb08b97fff8ce5ec2cbff2256aa390e440
Merge branch 'master' of git://git.samba.org/samba