Merge samba.org:/scratch/anton/linux-2.5
Anton Blanchard authored
into samba.org:/scratch/anton/linux-2.5_ppc64_work
46609240