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

[Jan Horak]

commit 84e7db257142b9d39ea6a7dd49b353ee76ab68d2
Merge: 6268510 3bac578
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Dec 20 13:47:11 2011 +0100

    Merge branch 'master' into f15

 .gitignore                        |    2 +
 mozilla-670719.patch              |   53 --------------------------------
 mozilla-696393.patch              |   58 ++++++++++++++---------------------
 sources                           |    4 +-
 thunderbird.spec                  |   40 +++++++++++++++++-------
 xulrunner-6.0-secondary-ipc.patch |   60 -------------------------------------
 xulrunner-9.0-secondary-ipc.patch |   60 +++++++++++++++++++++++++++++++++++++
 xulrunner-install.patch           |   12 -------
 8 files changed, 115 insertions(+), 174 deletions(-)
---