Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 14 Oct 2008 13:57:26 +0000 (15:57 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 14 Oct 2008 13:57:26 +0000 (15:57 +0200)
commit3fe406ee72a787fab2b9b4a8a9f1aa050187437c
tree961c61eedc07a05d81019c1d3815a7a348f2637a
parent4577fb5a3b35b8c7ffb1bf3e43f4aa8143c3746d
parentf4f59bf24803df975ed38d558c7b0931ca575c3d
Merge branch 'master' of git://git.samba.org/samba