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

[Jan Horak]

commit 39644fdd9a60c386982d4077f7c66ba506632412
Merge: ca93fb8 866ff42
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Sep 27 21:44:59 2011 +0200

    Merge branch 'master' into f15

 .gitignore                    |    2 ++
 sources                       |    4 ++--
 thunderbird-install-dir.patch |   36 ++++++++++++++++++++++++++++++++++++
 thunderbird.sh.in             |   10 +++++-----
 thunderbird.spec              |   38 ++++++++++++++------------------------
 5 files changed, 59 insertions(+), 31 deletions(-)
---