2nd merge from kernel study of origenboard.