after mergy with changes in Fujia-HP-Ubuntu