Summary of changes: cc36712... Fix a documentation bug that slipped through (*) 1d41a8e... Merge branch 'master' into el6 (*) This commit already existed in another branch; no separate mail sent