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

[Martin Stransky]

commit 1122addfbbfe2dc17dbfeea429823321235160e5
Merge: 0a4f563 e14ae82
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Jan 8 23:34:15 2013 +0100

    Merge branch 'master' into f17

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