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

[Martin Stransky]

commit 5767136afcc73219ccd1f2837471ed0b918b3405
Merge: e3c414a 91316e0
Author: Martin Stransky <stransky at redhat.com>
Date:   Mon Jan 7 15:20:31 2013 +0100

    Merge branch 'master' into f17

 mozilla-746112.patch |   86 ----------------------------------------------
 mozilla-813997.patch |   93 --------------------------------------------------
 sources              |    3 +-
 xulrunner.spec       |   12 +++----
 4 files changed, 7 insertions(+), 187 deletions(-)
---