[xulrunner/f15: 3/4] Merge branch 'master' into f15

[Jan Horak]

commit 74f1dd2feb56312b6b201c490947c6b0813616e9
Merge: 0827a5f 39c2347
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Jan 31 09:52:18 2012 +0100

    Merge branch 'master' into f15
    
    Conflicts:
    	xulrunner.spec

 .gitignore                                         |    1 +
 ...ozembed-9.0.patch => add-gtkmozembed-10.0.patch |  326 ++++++++++----------
 mozilla-193-pkgconfig.patch                        |   21 --
 mozilla-682832-proxy.patch                         |   68 ++--
 mozilla-696393.patch                               |   65 ----
 mozilla-706724.patch                               |   12 +
 mozilla-722127.patch                               |   74 +++++
 mozilla-file.patch                                 |   26 ++
 mozilla-libjpeg-turbo.patch                        |   34 --
 sources                                            |    2 +-
 xulrunner-10.0-gcc47.patch                         |   25 ++
 xulrunner-2.0-NetworkManager09.patch               |   51 ---
 xulrunner-2.0-network-link-service.patch           |  274 ----------------
 xulrunner-9.0-secondary-ipc.patch                  |   60 ----
 xulrunner.spec                                     |  153 ++++-----
 15 files changed, 405 insertions(+), 787 deletions(-)
---