Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Wed, 16 Sep 2009 10:57:09 +0000 (03:57 -0700)
committerAndrew Tridgell <tridge@samba.org>
Wed, 16 Sep 2009 10:57:09 +0000 (03:57 -0700)
commit1b3f5cee2e72b8eb3df4836c237255ac7ad57136
tree56ab0d2ebb34b9c747c1c2606fc2d617f4b77671
parent79082f400e3d0c21b53d54bfb42954c2396110b9
parent033ced60ac734161686bd3da685f2d7b056e17c8
Merge branch 'master' of ssh://git.samba.org/data/git/samba