Merge branch 'master' of git://git.samba.org/samba
authorNadezhda Ivanova <nadezhda.ivanova@postpath.com>
Mon, 4 Jan 2010 09:24:10 +0000 (11:24 +0200)
committerNadezhda Ivanova <nadezhda.ivanova@postpath.com>
Mon, 4 Jan 2010 09:24:10 +0000 (11:24 +0200)

Trivial merge