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

[Jan Horak]

commit eaeece52add46cfb79ab759f5d28f6bdd4eac1b8
Merge: 52b97e7 33cdb06
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Nov 27 12:22:11 2012 +0100

    Merge branch 'master' into f17

 xulrunner.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---