[dkim-milter/el5: 17/17] Merge remote-tracking branch 'origin/el6' into el5

[Jim Radford]

commit 84e5dfc4ae5ecc3fd6e9bfce0573ce6af4b81b64
Merge: e3acaae 47b117c
Author: Jim Radford <radford at fedoraproject.org>
Date:   Sun Jul 17 15:20:46 2011 -0700

    Merge remote-tracking branch 'origin/el6' into el5

 dkim-milter      |    8 ++++++--
 dkim-milter.spec |   24 ++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)
---