[dspam/el5/master: 8/9] Merge remote branch 'origin/master' into el5/master

[Nathanael Noblet]

commit d1920b216f06fce981b7f69ded00b3a2c3965c16
Merge: 2b41ba3 fc84043
Author: Nathanael d. Noblet <nathanael at gnat.ca>
Date:   Wed Sep 22 10:31:48 2010 -0600

    Merge remote branch 'origin/master' into el5/master
    
    Conflicts:
    	dspam.spec

 dspam.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---