Merge commit 'martin/for-tridge'
authorAndrew Tridgell <tridge@samba.org>
Thu, 8 Jan 2009 00:15:15 +0000 (11:15 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 8 Jan 2009 00:15:15 +0000 (11:15 +1100)
commit9467ca6878dcb28fb570b7e04882b315e8cbd234
treea2f80dca751ec0a01081c9b486e81dab9e4ff27f
parent62b59d8a7c46ed9a7bdca15e4336e1ccd0322533
parentbcfc58379f5bddba49cd378837174a6617710b5e
Merge commit 'martin/for-tridge'