Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Thu, 20 Nov 2008 10:23:26 +0000 (21:23 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 20 Nov 2008 10:23:26 +0000 (21:23 +1100)
commitfe6ddf7992ca3e72a26dbac6666e0f6270da611f
treee8a0d2fdefc26d00bc9138bd66867e37208c723d
parent5403ed6dcfdfc101b05b43f83002e720d81b4e38
parent0a6f9326cb99f14b5c9edd0d8854d8229df49910
Merge commit 'ronnie/master'