Merge git://oak/home/sfr/kernels/iseries/work