[mutt/f13/master: 5/5] Merge branch 'master' into f13

[Miroslav Lichvar]

commit 44bc95a888c2bb18a114a3e53dc43109f08d16a6
Merge: 0fb0a5b d66cf0e
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Tue Sep 21 12:28:08 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore                 |    3 ++-
 mutt-1.5.21-updating.patch |   24 ++++++++++++++++++++++++
 mutt.spec                  |   29 ++++++++++++++++++++++-------
 sources                    |    2 +-
 4 files changed, 49 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index 32889e7,360c09a..40f88ef
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,2 @@@
- mutt-1.5.20-20091214hg736b6a.tar.bz2
 -mutt-1.5.20-20100718hg1a35f0.tar.bz2
 -mutt-1.5.21.tar.gz
++mutt-1.5.20-20100718hg1a35f0.tar.bz2                                                                                                                                            
++mutt-1.5.21.tar.gz