Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Mon, 11 Aug 2008 13:33:46 +0000 (23:33 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 11 Aug 2008 13:33:46 +0000 (23:33 +1000)
commitfb7f69b1d6dd8b0715258dde736dc03e1c5e43aa
treebfa6a2ff58be52a93bc1eaf314aac3a098a3ff9d
parent96df98d9f86ecc6bb1a458eb2101e5c1bc0f96e6
parentc94b295b078dc009c18aa416d0de232a12241014
Merge commit 'ronnie/master'