[dspam/f14/master: 6/6] Merge remote-tracking branch 'origin/master' into f14

[Nathanael Noblet]

commit df00717543ab387f40198f12ad5935dd89a2ece9
Merge: 1abc59d 0249b41
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Thu Mar 3 11:58:55 2011 -0700

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

 dspam-3.9.0-configure.patch |  194 +++++++++++++++++++++++++++++++++++++++++++
 dspam.spec                  |   32 +++++---
 2 files changed, 214 insertions(+), 12 deletions(-)
---