Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Fri, 6 Mar 2009 00:26:20 +0000 (11:26 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 6 Mar 2009 00:26:20 +0000 (11:26 +1100)
commit0f2664a82128e38ac49c6e8e784129b779616a27
tree0b49e36148120d2ffec4ce8879e0463a7172b650
parent1a110993af1706e0c5df500fa7d14e16c0668372
parentecf26af22245d0f55aded50e8768b0c21495f98c
Merge commit 'ronnie/master'