Summary of changes: 8b3dc31... Update to 12.04 (*) c8b0ef5... Fix merging (*) 2c50d64... Fix merging again. (*) (*) This commit already existed in another branch; no separate mail sent