Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into ctdb-merge
commit17b2bea7093681a4c4119f9fe7104c018fd0af6f
authorAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 09:57:15 +0000 (16 12:57 +0300)
committerAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 09:57:15 +0000 (16 12:57 +0300)
tree87a3035d8479f7eb6171b9e74652a10531c9781d
parent060587fce558bf9e83d6c7b8e070a5ae58e3f275
parentdc568fd52ae8ffaaaef2015c5a207ed9a58a9a7f
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into ctdb-merge