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

[Martin Stransky]

commit e133a191713d1e7b407c5ccaad95ee9d0fda3379
Merge: 0103c4f b2e14f8
Author: Martin Stransky <stransky at redhat.com>
Date:   Thu Oct 11 13:59:13 2012 +0200

    Merge branch 'master' into f17

 sources        |    2 +-
 xulrunner.spec |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---