* Merge from Debian unstable. Remaining changes: + Fix thumb2 porting issues; we suspect that the mov found during code review is not an active code path; adding compile time error #ifdef __thumb__ to ensure that its really not used in Ubuntu; Thanks for Dave Martin for this patch (LP: #513725)