Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
authorAndrew Bartlett <abartlet@samba.org>
Sun, 8 Mar 2009 05:16:11 +0000 (16:16 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 8 Mar 2009 05:16:11 +0000 (16:16 +1100)
commit6ac77d19b5a25a53459a58e4828fa9eac0bf11f4
treebb504eecdcb94d6c82b522f5de0fd13de130fb41
parentbb6a2c8076e5e9eabad4ee7f09f6df979616fd13
parent46bcb10b5abb21758cf234764b64220ede1b7ab5
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema