merged changes from Faux123 Git, kernel updated to 3.0.60 as a result