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

[Jan Horak]

commit 4ad0003efa517360367dc7979e4bf6f06ab76c48
Merge: bca099b ec23a95
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Oct 16 11:51:45 2012 +0200

    Merge branch 'master' into f17

 xulrunner.spec |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---