Merge Zaurus branch