Summary of changes: 93d152f... Updated to 2011 (*) e3a1257... Fix rpath, include locale patch (*) f2651ad... Fix merge conflicts (*) This commit already existed in another branch; no separate mail sent