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

[Jaroslav Škarvada]

commit 5a022aff5ebc3a03bfdcf743f0ac3695324d7c24
Merge: 5e3cf43 5bb29c2
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Tue Aug 30 12:29:07 2011 +0200

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

 postfix.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---