commit from ubuntu 12.06
commit from ubuntu 12.07