Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Tue, 16 Dec 2008 20:17:54 +0000 (07:17 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 16 Dec 2008 20:17:54 +0000 (07:17 +1100)

Trivial merge