Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAlexander Bokovoy <ab@samba.org>
Sat, 8 Aug 2009 05:07:24 +0000 (08:07 +0300)
committerAlexander Bokovoy <ab@samba.org>
Sat, 8 Aug 2009 05:07:24 +0000 (08:07 +0300)

Trivial merge