Oops: usually there is nothing to rm.
Merge branch 'sl4a' into devel