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

[Jan Horak]

commit b4a63f6df4d854708bf4c6a9b372ad60780465a9
Merge: c9c2e72 203d662
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Aug 16 21:28:42 2011 +0200

    Merge branch 'master' into f15

 .gitignore                        |    2 +
 sources                           |    4 +-
 thunderbird.sh.in                 |    4 +-
 thunderbird.spec                  |   31 +++++++++---------
 xulrunner-2.0-secondary-jit.patch |   14 --------
 xulrunner-5.0-secondary-ipc.patch |   63 -------------------------------------
 6 files changed, 22 insertions(+), 96 deletions(-)
---