[dbmail/el5/master: 56/56] Merge remote branch 'origin/master' into el5

[Bernard Johnson]

commit 8eaa0559bd5ad821802d3a20bdf661723498dd97
Merge: ffaaa81 7e85d6a
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Sun Sep 12 15:50:31 2010 -0600

    Merge remote branch 'origin/master' into el5
    
    Conflicts:
    	.gitignore
    	dbmail.spec
    	sources

 .gitignore  |    3 +--
 dbmail.spec |   17 +++++------------
 sources     |    2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)
---