[dspam/el5: 2/2] Merge branch 'f15' into el5

[Nathanael Noblet]

commit fdea76dff8fe5db56c6ee424e519eb150d7c95f8
Merge: 32229ad 80d3de4
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Wed Aug 3 11:39:58 2011 -0600

    Merge branch 'f15' into el5

 dspam-3.9.0-file-name.patch |   47 -------------------------------------------
 dspam.spec                  |   12 ++++++----
 2 files changed, 7 insertions(+), 52 deletions(-)
---