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

[Martin Stransky]

commit 0a4f563786af1f4614ba19b5cf979186b69c8023
Merge: 5767136 8b21f12
Author: Martin Stransky <stransky at redhat.com>
Date:   Tue Jan 8 12:30:41 2013 +0100

    Merge branch 'master' into f17

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