Merge branch 'master' of /home/tridge/samba/git/combined
commitfe36b8af64195f10acead12d4a4f426cc8772a8c
authorAndrew Tridgell <tridge@samba.org>
Sat, 12 Sep 2009 01:15:38 +0000 (12 11:15 +1000)
committerAndrew Tridgell <tridge@samba.org>
Sat, 12 Sep 2009 01:15:38 +0000 (12 11:15 +1000)
treeaf98810b529728d46a10f0ac1e2d3203b63323a2
parent51fd80647de9cb531181eb1eeefe9ad2c473f784
parentbbc0a56da59df8b7cd6f19f99cfaac9c3909779f
Merge branch 'master' of /home/tridge/samba/git/combined