Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
authorAndrew Bartlett <abartlet@samba.org>
Mon, 9 Mar 2009 23:59:14 +0000 (10:59 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 9 Mar 2009 23:59:14 +0000 (10:59 +1100)
commitc218d3e1173355acf025471a10b4b6425b9c086b
tree3e5be3c411ebe2575914f7866c91bad81f711154
parent6ac77d19b5a25a53459a58e4828fa9eac0bf11f4
parent218ce0e80532b0dbc595e72502d9596a35acdffd
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema