Merge branch 'master' of git://git.samba.org/samba
authorNadezhda Ivanova <nadezhda.ivanova@postpath.com>
Thu, 7 Jan 2010 10:34:06 +0000 (12:34 +0200)
committerNadezhda Ivanova <nadezhda.ivanova@postpath.com>
Thu, 7 Jan 2010 10:34:06 +0000 (12:34 +0200)
commit309473f938d18b9993c2c4f120eeff7b4641985a
treec07dde840efd38b75a4b196b247c11946c3b57c9
parentfb5383c69ee52fb5e6d066a43451dc8c806cc795
parent71a40d7e2c21bf3ac47be3ec57fb091ff420ba9a
Merge branch 'master' of git://git.samba.org/samba