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

[Dan Horák]

commit 0827a5f701ac6a84a5b8e73b74b181f606924045
Merge: 2ead2a7 2f0001b
Author: Dan Horák <dan at danny.cz>
Date:   Wed Jan 4 18:07:27 2012 +0100

    Merge branch 'master' into f15

 xulrunner-9.0-secondary-build-fix.patch |   11 +++++++++++
 xulrunner.spec                          |    8 +++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---