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

[Martin Stransky]

commit c10abc765f7dd063ef364e53e61b8f93515d4425
Merge: 61255d7 0f3792d
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Wed Jan 9 12:36:58 2013 +0100

    Merge branch 'master' into f17

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