[dbmail/f15: 7/7] Merge branch 'master' into f15

[Bernard Johnson]

commit 551225bc69387ff063ff3acbec82e78f1d373cca
Merge: d36f627 99ff274
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Mon Aug 15 23:46:18 2011 -0600

    Merge branch 'master' into f15
    
    Conflicts:
    	sources

 .gitignore              |    2 ++
 dbmail-3.0.0-glib.patch |   16 ++++++++--------
 sources                 |    2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)
---