Merge branch 'master' of git://git.samba.org/samba
authorNadezhda Ivanova <nadezhda.ivanova@postpath.com>
Wed, 13 Jan 2010 10:02:31 +0000 (12:02 +0200)
committerNadezhda Ivanova <nadezhda.ivanova@postpath.com>
Wed, 13 Jan 2010 10:02:31 +0000 (12:02 +0200)
commit9b3871ed293f76e770e572cd6b59f59670f1f6f8
tree2b79286e3a6f7af9e26466393a0b26075a238be8
parent309473f938d18b9993c2c4f120eeff7b4641985a
parentca847952054f5bbde1d40ad4260589b6fcc9721d
Merge branch 'master' of git://git.samba.org/samba