Summary of changes: cc30592... update build time defines. thanks dan-fedora bz#1026545 (*) a38ea80... Merge branch 'master' into f20 (*) This commit already existed in another branch; no separate mail sent