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

[Jan Horak]

commit ba8e69bb904b2c5ed401911d3a9ef0d6fb3187a0
Merge: 1966a42 fdefea8
Author: Jan Horak <jhorak at redhat.com>
Date:   Wed Dec 12 13:10:11 2012 +0100

    Merge branch 'master' into f17

 mozilla-813997.patch |   83 ++++++-------------------------------------------
 xulrunner.spec       |    4 +-
 2 files changed, 13 insertions(+), 74 deletions(-)
---