Summary of changes: 3355b88... Update to new upstream snapshot: 20111230 (*) f4f1997... Merge branch 'master' into el5 (*) This commit already existed in another branch; no separate mail sent