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

[Dan Horák]

commit c9c2e72ef4ff2cfb9b386c858a989dbc179de43b
Merge: 2b84319 fda3b5f
Author: Dan Horák <dan at danny.cz>
Date:   Wed Jul 20 10:42:58 2011 +0200

    Merge branch 'master' into f15

 mozilla-build-s390.patch          |   11 ------
 thunderbird.spec                  |   14 +++++---
 xulrunner-2.0-secondary-jit.patch |   14 ++++++++
 xulrunner-5.0-secondary-ipc.patch |   63 +++++++++++++++++++++++++++++++++++++
 4 files changed, 86 insertions(+), 16 deletions(-)
---