[postfix/f15: 2/2] Merge remote-tracking branch 'origin/f16' into f15

[Jaroslav Škarvada]

commit f54a85bf00977db2765a08cf37e06c39498a4fba
Merge: 9f7a2b3 890f7fd
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Wed Apr 25 21:29:12 2012 +0200

    Merge remote-tracking branch 'origin/f16' into f15

 .gitignore   |    1 +
 postfix.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc postfix.spec
index dde3d70,ad6e9b2..6adb2fb
--- a/postfix.spec
+++ b/postfix.spec
@@@ -26,9 -29,13 +26,9 @@@
  %define postfix_sample_dir	%{postfix_doc_dir}/samples
  %define postfix_readme_dir	%{postfix_doc_dir}/README_FILES
  
 -%if %{?_hardened_build:%{_hardened_build}}%{!?_hardened_build:0}
 -%global harden -pie -Wl,-z,relro,-z,now
 -%endif
 -
  Name: postfix
  Summary: Postfix Mail Transport Agent
- Version: 2.8.7
+ Version: 2.8.10
  Release: 1%{?dist}
  Epoch: 2
  Group: System Environment/Daemons