Merge branch 'master' of git://git.samba.org/samba
authorLars Müller <lars@samba.org>
Mon, 18 Jan 2010 10:52:33 +0000 (11:52 +0100)
committerLars Müller <lars@samba.org>
Mon, 18 Jan 2010 10:52:33 +0000 (11:52 +0100)

Trivial merge