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)

Trivial merge