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

[Martin Stransky]

commit 1748fb4bb2a6d9157b79ce95d6e15cf1b0252512
Merge: 1dfc591 4ef9150
Author: Martin Stransky <stransky at redhat.com>
Date:   Tue Nov 8 09:52:18 2011 +0100

    Merge branch 'master' into f15

 .gitignore                                         |    1 +
 add-gtkmozembed.patch => add-gtkmozembed-8.0.patch |  502 ++++++++++----------
 mozilla-686280.patch                               |   25 +
 mozilla-build-sbrk.patch                           |   24 -
 sources                                            |    2 +-
 xulrunner-5.0-curl.patch                           |   44 --
 xulrunner-7.0.1-yarr-jit.patch                     |   44 --
 xulrunner.spec                                     |   24 +-
 8 files changed, 291 insertions(+), 375 deletions(-)
---