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

[Martin Stransky]

commit b139b47b1b3af037d42805b0257be0a3a51d92f8
Merge: bd5e127 503a3b9
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Wed Jan 9 11:07:13 2013 +0100

    Merge branch 'master' into f17

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