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

[Martin Stransky]

commit 61255d76a4a8e7af6cfe6f144c32a80e413cecbe
Merge: b139b47 b260f32
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Wed Jan 9 12:21:32 2013 +0100

    Merge branch 'master' into f17

 xulrunner.spec |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)
---