Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Wed, 16 Jul 2008 02:46:43 +0000 (12:46 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 16 Jul 2008 02:46:43 +0000 (12:46 +1000)
commit9478852f2b4f530994b2211fff45413d1da82dd9
treeee653e2af2058847ba3fbec9773fbe8776f761c9
parent9043913a54fe707083697f0587c6ffde86ca5a69
parent2b0bd6c302545f2533a7a67dfc6bb5f9f60799f7
Merge commit 'ronnie/master'