[rubygem-actionmailer/f16: 2/2] Merge branch 'master' into f16

[Vít Ondruch]

commit 425bb558a720cd01a7d82e6de9e4ce0554ae4a59
Merge: e2ac288 aa186cf
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Mon Aug 22 15:34:01 2011 +0200

    Merge branch 'master' into f16

 .gitignore                         |    2 ++
 actionmailer-update-mail-dep.patch |   10 +++++-----
 rubygem-actionmailer.spec          |   11 +++++++----
 sources                            |    4 ++--
 4 files changed, 16 insertions(+), 11 deletions(-)
---