[postfix/f15: 2/2] Merge branch 'master' into f15

[Jaroslav Škarvada]

commit 5e3cf4321148cee0af6463e59c278ce519a12ac4
Merge: cf01ce2 cdd6733
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Thu Jul 7 14:51:46 2011 +0200

    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore

 .gitignore   |    4 ++--
 postfix.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---