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)

Trivial merge