Merge branch 'master' of git://git.samba.org/samba
authorNadezhda Ivanova <nadezhda.ivanova@postpath.com>
Fri, 25 Sep 2009 01:57:27 +0000 (18:57 -0700)
committerNadezhda Ivanova <nadezhda.ivanova@postpath.com>
Fri, 25 Sep 2009 01:57:27 +0000 (18:57 -0700)

Trivial merge