[thunderbird/f15: 2/2] Merge branch 'master' into f15

[Jan Horak]

commit d9b05b6155572678d9998e1230cc0b9b66f22ad4
Merge: 39644fd 00c89c1
Author: Jan Horak <jhorak at redhat.com>
Date:   Fri Sep 30 16:17:52 2011 +0200

    Merge branch 'master' into f15

 .gitignore       |    2 ++
 sources          |    4 ++--
 thunderbird.spec |    7 +++++--
 3 files changed, 9 insertions(+), 4 deletions(-)
---